diff options
author | James Morris <jmorris@namei.org> | 2010-03-31 08:39:27 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-03-31 08:39:27 +1100 |
commit | d25d6fa1a95f465ff1ec4458ca15e30b2c8dffec (patch) | |
tree | 7362b182dedd825fc762ef7706830837e42943af /.gitignore | |
parent | 225a9be24d799aa16d543c31fb09f0c9ed1d9caa (diff) | |
parent | 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6 (diff) | |
download | linux-rt-d25d6fa1a95f465ff1ec4458ca15e30b2c8dffec.tar.gz |
Merge branch 'master' into next
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index de6344e15706..a2939fc10b22 100644 --- a/.gitignore +++ b/.gitignore @@ -34,13 +34,18 @@ modules.builtin # # Top-level generic files # -tags -TAGS -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 |