diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-17 19:36:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-17 19:36:54 (GMT) |
| commit | 212607494dee5f32667c548259e6347070312b4f (patch) | |
| tree | 80bdd2239f1315bbc173d9dcd74746f19f55e1d7 /Documentation | |
| parent | c8394bb46667c059f00433224f09bda8de878128 (diff) | |
| parent | 746be68d31b87422b89ac91ffb7699ab3f39f70f (diff) | |
| download | git-212607494dee5f32667c548259e6347070312b4f.zip git-212607494dee5f32667c548259e6347070312b4f.tar.gz git-212607494dee5f32667c548259e6347070312b4f.tar.bz2 | |
Merge branch 'nd/glossary-content-pathspec-markup' into maint
* nd/glossary-content-pathspec-markup:
glossary-content.txt: fix documentation of "**" patterns
Diffstat (limited to 'Documentation')
| -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 e470661..aa1c888 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 |