summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-20 23:53:52 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-20 23:53:52 +0200
commiteaf729c8a8bfc9c7a5ff5659e3b2584bf2ef22e1 (patch)
tree60d6d792238627086c965642bcd8aba1036cd4ef
parentMerge branch 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/arnd... (diff)
downloadlinux-eaf729c8a8bfc9c7a5ff5659e3b2584bf2ef22e1.tar.xz
linux-eaf729c8a8bfc9c7a5ff5659e3b2584bf2ef22e1.zip
Un-ignore "vmlinux.lds.S" in .gitignore
We ignore all the generated files called "vmlinux*" from the top-level gitignore, but that also ends up catching a few files that we track, and that people do edit. Notably the "vmlinux.lds.S" file, that each architecture has. You can always use "git add -f" to override the ignore file, but we might as well just make it explicit for this file. Bitten-by-and-tested-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 8d15830b883d..a232295b99ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@
tags
TAGS
vmlinux*
+!vmlinux.lds.S
System.map
Module.symvers