Skip to content

Commit

Permalink
Merge branch 'nd/glossary-content-pathspec-markup'
Browse files Browse the repository at this point in the history
* nd/glossary-content-pathspec-markup:
  glossary-content.txt: fix documentation of "**" patterns
  • Loading branch information
Junio C Hamano committed Dec 3, 2013
2 parents 0b6f39b + 746be68 commit 34f4a75
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Documentation/glossary-content.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 34f4a75

Please sign in to comment.