summaryrefslogtreecommitdiffstats
path: root/gitglossary.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-09 15:35:20 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-09 15:35:20 -0700
commit8eac268d5824abada1efa8990ea211f476ca942b (patch)
tree712e2b7c4f6bcacc8bacfed4d7ee98ed8aa484ce /gitglossary.html
parent91e3395c6964b309b071bf9fe79bd004c979b297 (diff)
downloadgit-htmldocs-8eac268d5824abada1efa8990ea211f476ca942b.tar.gz
Autogenerated HTML docs for v1.8.4-242-gbb80ee
Diffstat (limited to 'gitglossary.html')
-rw-r--r--gitglossary.html86
1 files changed, 82 insertions, 4 deletions
diff --git a/gitglossary.html b/gitglossary.html
index 316cd524a..88c5d7845 100644
--- a/gitglossary.html
+++ b/gitglossary.html
@@ -1299,10 +1299,88 @@ parenthesis <code>(</code>, a comma-separated list of zero or more "magic words"
and a close parentheses <code>)</code>, and the remainder is the pattern to match
against the path.</p></div>
<div class="paragraph"><p>The "magic signature" consists of an ASCII symbol that is not
-alphanumeric. Currently only the slash <code>/</code> is recognized as a
-"magic signature": it makes the pattern match from the root of
-the working tree, even when you are running the command from
-inside a subdirectory.</p></div>
+alphanumeric.</p></div>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+top <code>/</code>
+</dt>
+<dd>
+<p>
+ The magic word <code>top</code> (mnemonic: <code>/</code>) makes the pattern match
+ from the root of the working tree, even when you are running
+ the command from inside a subdirectory.
+</p>
+</dd>
+<dt class="hdlist1">
+literal
+</dt>
+<dd>
+<p>
+ Wildcards in the pattern such as <code>*</code> or <code>?</code> are treated
+ as literal characters.
+</p>
+</dd>
+<dt class="hdlist1">
+icase
+</dt>
+<dd>
+<p>
+ Case insensitive match.
+</p>
+</dd>
+<dt class="hdlist1">
+glob
+</dt>
+<dd>
+<p>
+ Git treats the pattern as a shell glob suitable for
+ consumption by fnmatch(3) with the FNM_PATHNAME flag:
+ wildcards in the pattern will not match a / in the pathname.
+ For example, "Documentation/&#42;.html" matches
+ "Documentation/git.html" but not "Documentation/ppc/ppc.html"
+ or "tools/perf/Documentation/perf.html".
+</p>
+<div class="paragraph"><p>Two consecutive asterisks ("<code>**</code>") in patterns matched against
+full pathname may have special meaning:</p></div>
+<div class="ulist"><ul>
+<li>
+<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"
+ 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
+ to the location of the <code>.gitignore</code> file, with infinite depth.
+</p>
+</li>
+<li>
+<p>
+A slash followed by two consecutive asterisks then a slash
+ matches zero or more directories. For example, "<code>a/**/b</code>"
+ matches "<code>a/b</code>", "<code>a/x/b</code>", "<code>a/x/y/b</code>" and so on.
+</p>
+</li>
+<li>
+<p>
+Other consecutive asterisks are considered invalid.
+</p>
+<div class="paragraph"><p>Glob magic is incompatible with literal magic.</p></div>
+</li>
+</ul></div>
+</dd>
+</dl></div>
+</div></div>
+<div class="paragraph"><p>Currently only the slash <code>/</code> is recognized as the "magic signature",
+but it is envisioned that we will support more types of magic in later
+versions of Git.</p></div>
<div class="paragraph"><p>A pathspec with only a colon means "there is no pathspec". This form
should not be combined with other pathspec.</p></div>
</dd>