Merging r261368:

[oota-llvm.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1f3f1a9520c0d95e271232e4eee08ba84f2fc02f..e3d191dcbcced9f0c97a5b6838b88eddabc0b47f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,7 @@
 # Byte compiled python modules.
 *.pyc
 # vim swap files
-.*.swp
+.*.sw?
 .sw?
 #OS X specific files.
 .DS_store
@@ -37,14 +37,14 @@ cscope.files
 cscope.out
 autoconf/aclocal.m4
 autoconf/autom4te.cache
-compile_commands.json
+/compile_commands.json
 
 #==============================================================================#
 # Directories to ignore (do not add trailing '/'s, they skip symlinks).
 #==============================================================================#
 # External projects that are tracked independently.
 projects/*
-!projects/CMakeLists.txt
+!projects/*.*
 !projects/Makefile
 # Clang, which is tracked independently.
 tools/clang