summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-12 16:30:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-12 16:30:23 -0800
commit6db823cf4b44f235b5e1da8ec1fe3c3cd63647fe (patch)
tree706565b4270210520102598ab7f58226d952aac4
parent64d5aea30062ce9f3ce7c62be8ae65e776cbfee2 (diff)
downloadop-kernel-dev-6db823cf4b44f235b5e1da8ec1fe3c3cd63647fe.zip
op-kernel-dev-6db823cf4b44f235b5e1da8ec1fe3c3cd63647fe.tar.gz
Fix up .gitignore for top-level file patterns
Some of the gitignore file patters were explicitly meant to be only for the top level, but weren't marked that way, so they would trigger recursively in subdirectories too. Normally that was harmless, but at least "linux" happened to trigger elsewhere too. Fix it up. And other patterns in that section weren't necessarily top-level at all. Reported-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--.gitignore20
1 files changed, 12 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index efab0eb..a2939fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,14 +34,18 @@ modules.builtin
#
# Top-level generic files
#
-tags
-TAGS
-linux
-vmlinux
-vmlinuz
-System.map
-Module.markers
-Module.symvers
+/tags
+/TAGS
+/linux
+/vmlinux
+/vmlinuz
+/System.map
+/Module.markers
+/Module.symvers
+
+#
+# git files that we don't want to ignore even it they are dot-files
+#
!.gitignore
!.mailmap
OpenPOWER on IntegriCloud