1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-17 14:34:49 +01:00

Merge branch 'master' into next

* master:
  Documentation: add another example to git-ls-files
This commit is contained in:
Junio C Hamano 2006-06-07 20:19:18 -07:00
commit a95e01885a

View file

@ -195,8 +195,7 @@ An exclude pattern is of the following format:
- if it does not contain a slash '/', it is a shell glob - if it does not contain a slash '/', it is a shell glob
pattern and used to match against the filename without pattern and used to match against the filename without
leading directories (i.e. the same way as the current leading directories.
implementation).
- otherwise, it is a shell glob pattern, suitable for - otherwise, it is a shell glob pattern, suitable for
consumption by fnmatch(3) with FNM_PATHNAME flag. I.e. a consumption by fnmatch(3) with FNM_PATHNAME flag. I.e. a
@ -222,6 +221,19 @@ An example:
--exclude-per-directory=.gitignore --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 See Also
-------- --------