X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=.gitignore;h=ecf2e3e422b8ee260c8a49fb9c60e748b51543e1;hb=0b1bcbf6b87f19402d8aef1ef9f6e527a07de9d4;hp=398a4bbaa6ee673e812a3ba266c96801c2d784a3;hpb=7232b09619a1b05584d05ea67884b36602fa71bc;p=oota-llvm.git

diff --git a/.gitignore b/.gitignore
index 398a4bbaa6e..ecf2e3e422b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,46 @@
-tools/clang
+#==============================================================================#
+# This file specifies intentionally untracked files that git should ignore.
+# See: http://www.kernel.org/pub/software/scm/git/docs/gitignore.html
+#
+# This file is intentionally different from the output of `git svn show-ignore`,
+# as most of those are useless.
+#==============================================================================#
 
-*.pyc
+#==============================================================================#
+# File extensions to be ignored anywhere in the tree.
+#==============================================================================#
+# Temp files created by most text editors.
 *~
-.gitignore
+# Merge files created by git.
+*.orig
+# Byte compiled python modules.
+*.pyc
+# vim swap files
+.*.swp
+
+#==============================================================================#
+# Explicit files to ignore (only matches one).
+#==============================================================================#
 .gitusers
-projects/test-suite
-projects/test-suite-externals
-projects/compiler-rt
-projects/libcxx
+autom4te.cache
 cscope.files
 cscope.out
+autoconf/aclocal.m4
+autoconf/autom4te.cache
+
+#==============================================================================#
+# Directories to ignore (do not add trailing '/'s, they skip symlinks).
+#==============================================================================#
+# External projects that are tracked independently.
+projects/*
+!projects/sample
+!projects/CMakeLists.txt
+!projects/Makefile
+# Clang, which is tracked independently.
+tools/clang
+# LLDB, which is tracked independently.
+tools/lldb
+# lld, which is tracked independently.
+tools/lld
+# Sphinx build tree, if building in-source dir.
+docs/_build