diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-12-03 11:41:52 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-12-03 11:41:52 -0800 |
commit | 34f4a75f1efb9804553802b8cf6b0f6dc6e5e6c4 (patch) | |
tree | dc749e32b4f4f85041488742c6ce6976f5efde3e | |
parent | 0b6f39b06099a62e43deb78db624be5988bcf280 (diff) | |
parent | 746be68d31b87422b89ac91ffb7699ab3f39f70f (diff) | |
download | git-34f4a75f1efb9804553802b8cf6b0f6dc6e5e6c4.tar.gz |
Merge branch 'nd/glossary-content-pathspec-markup'
* nd/glossary-content-pathspec-markup:
glossary-content.txt: fix documentation of "**" patterns
-rw-r--r-- | Documentation/glossary-content.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index e4706615be..aa1c8880dd 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -362,12 +362,12 @@ full pathname may have special meaning: - A leading "`**`" followed by a slash means match in all directories. For example, "`**/foo`" matches file or directory - "`foo`" anywhere, the same as pattern "`foo`". "**/foo/bar" + "`foo`" anywhere, the same as pattern "`foo`". "`**/foo/bar`" matches file or directory "`bar`" anywhere that is directly under directory "`foo`". - - A trailing "/**" matches everything inside. For example, - "abc/**" matches all files inside directory "abc", relative + - A trailing "`/**`" matches everything inside. For example, + "`abc/**`" matches all files inside directory "abc", relative to the location of the `.gitignore` file, with infinite depth. - A slash followed by two consecutive asterisks then a slash |