summaryrefslogtreecommitdiffstats
path: root/glossary-content.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-12-03 14:07:11 -0800
committerJunio C Hamano <gitster@pobox.com>2013-12-03 14:07:11 -0800
commitb73af6c3bb75d464c5816f310eafe4af58c158a7 (patch)
tree6cb2ea7dedd3219b7377e188b10198805b9dce72 /glossary-content.txt
parent6c7be4687b43e460af156641dede43df6fad8bef (diff)
downloadgit-htmldocs-b73af6c3bb75d464c5816f310eafe4af58c158a7.tar.gz
Autogenerated HTML docs for v1.8.5.1-19-gdaad3
Diffstat (limited to 'glossary-content.txt')
-rw-r--r--glossary-content.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/glossary-content.txt b/glossary-content.txt
index e4706615b..aa1c8880d 100644
--- a/glossary-content.txt
+++ b/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