summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Karsten Blees <karsten.blees@gmail.com>2013-11-07 17:30:47 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-11-07 10:49:52 -0800
commit8447dc890488a953ab190e8826bc9dd175b28df9 (patch)
treec7b64562002463779b41e8a7f835296b968ca99d
parentt5570: Update for clone-progress-to-stderr branch (diff)
downloadtgif-8447dc890488a953ab190e8826bc9dd175b28df9.tar.xz
gitignore.txt: fix documentation of "**" patterns
"**" means bold in ASCIIDOC, so we need to escape it. Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/gitignore.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 54e334e3af..f971960512 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -113,12 +113,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