diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-02-15 14:55:46 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 14:55:46 -0800 |
commit | 0dbd562cc4bea7f51f63e5786b84730d5e6a64a2 (patch) | |
tree | 41c217951fc1d5f90e4549e1cd0b07694f53d7fb | |
parent | Merge branch 'tg/reset-hard-show-head-with-pretty' (diff) | |
parent | gitignore.txt: elaborate shell glob syntax (diff) | |
download | tgif-0dbd562cc4bea7f51f63e5786b84730d5e6a64a2.tar.xz |
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.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 |