diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:18 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-22 14:24:18 -0700 |
commit | 34f6f0eca294294f5a5bae3a85bca9d97782457e (patch) | |
tree | 6bc6abbe6c7975ee528c3b8535331db794a78af6 /Documentation | |
parent | fda2326cb71a0f133286d02ef1dfe8338f7f2249 (diff) | |
parent | 2e22a85e5c01d041434682fe75f58be94de0801b (diff) | |
download | git-34f6f0eca294294f5a5bae3a85bca9d97782457e.tar.gz |
Merge branch 'nd/ignore-glob-doc-update' into maint
Doc update.
* nd/ignore-glob-doc-update:
gitignore.txt: elaborate shell glob syntax
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/gitignore.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index 63260f0056..ff5d7f9ed6 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 |