summaryrefslogtreecommitdiffstats
path: root/gitglossary.html
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 /gitglossary.html
parent6c7be4687b43e460af156641dede43df6fad8bef (diff)
downloadgit-htmldocs-b73af6c3bb75d464c5816f310eafe4af58c158a7.tar.gz
Autogenerated HTML docs for v1.8.5.1-19-gdaad3
Diffstat (limited to 'gitglossary.html')
-rw-r--r--gitglossary.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/gitglossary.html b/gitglossary.html
index 4e570f655..4e6d7675b 100644
--- a/gitglossary.html
+++ b/gitglossary.html
@@ -1366,15 +1366,15 @@ full pathname may have special meaning:</p></div>
<p>
A leading "<code>**</code>" followed by a slash means match in all
directories. For example, "<code>**/foo</code>" matches file or directory
- "<code>foo</code>" anywhere, the same as pattern "<code>foo</code>". "**/foo/bar"
+ "<code>foo</code>" anywhere, the same as pattern "<code>foo</code>". "<code>**/foo/bar</code>"
matches file or directory "<code>bar</code>" anywhere that is directly
under directory "<code>foo</code>".
</p>
</li>
<li>
<p>
-A trailing "/<strong>" matches everything inside. For example,
- "abc/</strong>" matches all files inside directory "abc", relative
+A trailing "<code>/**</code>" matches everything inside. For example,
+ "<code>abc/**</code>" matches all files inside directory "abc", relative
to the location of the <code>.gitignore</code> file, with infinite depth.
</p>
</li>