diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 01:30:23 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 01:30:23 +0100 |
| commit | 6db823cf4b44f235b5e1da8ec1fe3c3cd63647fe (patch) | |
| tree | 706565b4270210520102598ab7f58226d952aac4 /.gitignore | |
| parent | Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | linux-6db823cf4b44f235b5e1da8ec1fe3c3cd63647fe.tar.xz linux-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-- | .gitignore | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index efab0ebec859..a2939fc10b22 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 |