aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds2010-03-12 18:30:23 -0600
committerLinus Torvalds2010-03-12 18:30:23 -0600
commit6db823cf4b44f235b5e1da8ec1fe3c3cd63647fe (patch)
tree706565b4270210520102598ab7f58226d952aac4 /.gitignore
parent64d5aea30062ce9f3ce7c62be8ae65e776cbfee2 (diff)
downloadam43-linux-kernel-6db823cf4b44f235b5e1da8ec1fe3c3cd63647fe.tar.gz
am43-linux-kernel-6db823cf4b44f235b5e1da8ec1fe3c3cd63647fe.tar.xz
am43-linux-kernel-6db823cf4b44f235b5e1da8ec1fe3c3cd63647fe.zip
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>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore20
1 files changed, 12 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index efab0ebec85..a2939fc10b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,14 +34,18 @@ modules.builtin
34# 34#
35# Top-level generic files 35# Top-level generic files
36# 36#
37tags 37/tags
38TAGS 38/TAGS
39linux 39/linux
40vmlinux 40/vmlinux
41vmlinuz 41/vmlinuz
42System.map 42/System.map
43Module.markers 43/Module.markers
44Module.symvers 44/Module.symvers
45
46#
47# git files that we don't want to ignore even it they are dot-files
48#
45!.gitignore 49!.gitignore
46!.mailmap 50!.mailmap
47 51