From 1f95a9db4bc8baf3d97fbfcb2f31e573e13b059a Mon Sep 17 00:00:00 2001
From: "Michael J. Spencer" <bigcheesegs@gmail.com>
Date: Fri, 17 Dec 2010 17:22:50 +0000
Subject: [PATCH] Cleanup and document .gitignore.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122066 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .gitignore | 38 ++++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 97d08ad1ae2..2e2713a48ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,37 @@
-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.
 *~
+# Merge files created by git.
+*.orig
+# Byte compiled python modules.
+*.pyc
+
+#==============================================================================#
+# Explicit files to ignore (only matches one).
+#==============================================================================#
 .gitusers
-projects/test-suite
-projects/test-suite-externals
-projects/compiler-rt
-projects/libcxx
 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
-- 
2.34.1