Browse Source

Merge branch 'nd/glossary-content-pathspec-markup' into maint

* nd/glossary-content-pathspec-markup:
  glossary-content.txt: fix documentation of "**" patterns
maint
Junio C Hamano 11 years ago
parent
commit
212607494d
  1. 6
      Documentation/glossary-content.txt

6
Documentation/glossary-content.txt

@ -362,12 +362,12 @@ full pathname may have special meaning: @@ -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

Loading…
Cancel
Save