summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-07 20:19:18 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-07 20:19:18 -0700
commita95e01885a6569788de91939ef0872ada51b03e2 (patch)
tree14dbb48e459d11fae5b513f227db35eb005c2499
parentMerge branch 'master' into next (diff)
parentDocumentation: add another example to git-ls-files (diff)
downloadtgif-a95e01885a6569788de91939ef0872ada51b03e2.tar.xz
Merge branch 'master' into next
* master: Documentation: add another example to git-ls-files
-rw-r--r--Documentation/git-ls-files.txt16
1 files changed, 14 insertions, 2 deletions
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index a29c633c8d..4d8a2ad2d7 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -195,8 +195,7 @@ An exclude pattern is of the following format:
- if it does not contain a slash '/', it is a shell glob
pattern and used to match against the filename without
- leading directories (i.e. the same way as the current
- implementation).
+ leading directories.
- otherwise, it is a shell glob pattern, suitable for
consumption by fnmatch(3) with FNM_PATHNAME flag. I.e. a
@@ -222,6 +221,19 @@ An example:
--exclude-per-directory=.gitignore
--------------------------------------------------------------
+Another example:
+
+--------------------------------------------------------------
+ $ cat .gitignore
+ vmlinux*
+ $ ls arch/foo/kernel/vm*
+ arch/foo/kernel/vmlinux.lds.S
+ $ echo '!/vmlinux*' >arch/foo/kernel/.gitignore
+--------------------------------------------------------------
+
+The second .gitignore keeps `arch/foo/kernel/vmlinux.lds.S` file
+from getting ignored.
+
See Also
--------