summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-15 22:55:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-15 22:55:46 (GMT)
commit0dbd562cc4bea7f51f63e5786b84730d5e6a64a2 (patch)
tree41c217951fc1d5f90e4549e1cd0b07694f53d7fb
parente6b4a549c3b2189a8cbd154ee0a3dac511061842 (diff)
parent2e22a85e5c01d041434682fe75f58be94de0801b (diff)
downloadgit-0dbd562cc4bea7f51f63e5786b84730d5e6a64a2.zip
git-0dbd562cc4bea7f51f63e5786b84730d5e6a64a2.tar.gz
git-0dbd562cc4bea7f51f63e5786b84730d5e6a64a2.tar.bz2
Merge branch 'nd/ignore-glob-doc-update'
Doc update. * nd/ignore-glob-doc-update: gitignore.txt: elaborate shell glob syntax
-rw-r--r--Documentation/gitignore.txt11
1 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 63260f0..ff5d7f9 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -102,12 +102,11 @@ PATTERN FORMAT
(relative to the toplevel of the work tree if not from a
`.gitignore` file).
- - Otherwise, Git treats the pattern as a shell glob suitable
- for consumption by fnmatch(3) with the FNM_PATHNAME flag:
- wildcards in the pattern will not match a / in the pathname.
- For example, "Documentation/{asterisk}.html" matches
- "Documentation/git.html" but not "Documentation/ppc/ppc.html"
- or "tools/perf/Documentation/perf.html".
+ - Otherwise, Git treats the pattern as a shell glob: "`*`" matches
+ anything except "`/`", "`?`" matches any one character except "`/`"
+ and "`[]`" matches one character in a selected range. See
+ fnmatch(3) and the FNM_PATHNAME flag for a more detailed
+ description.
- A leading slash matches the beginning of the pathname.
For example, "/{asterisk}.c" matches "cat-file.c" but not