summaryrefslogtreecommitdiffstats
path: root/gitglossary.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-10 12:33:07 -0800
committerJunio C Hamano <gitster@pobox.com>2014-01-10 12:33:07 -0800
commit21bc18b3b222ee68dc0f58c7ff6c92fd44938b2d (patch)
treedeb6d03b38893fa4dba338ae565980a5086fa585 /gitglossary.html
parent9906f1f2277410d5f7fedc74ded20e8490812568 (diff)
downloadgit-htmldocs-21bc18b3b222ee68dc0f58c7ff6c92fd44938b2d.tar.gz
Autogenerated HTML docs for v1.8.5.2-309-ga2501
Diffstat (limited to 'gitglossary.html')
-rw-r--r--gitglossary.html37
1 files changed, 22 insertions, 15 deletions
diff --git a/gitglossary.html b/gitglossary.html
index 4e6d7675b..c88264d30 100644
--- a/gitglossary.html
+++ b/gitglossary.html
@@ -1307,27 +1307,29 @@ including Documentation/chapter_1/figure_1.jpg.</p></div>
<div class="paragraph"><p>A pathspec that begins with a colon <code>:</code> has special meaning. In the
short form, the leading colon <code>:</code> is followed by zero or more "magic
signature" letters (which optionally is terminated by another colon <code>:</code>),
-and the remainder is the pattern to match against the path. The optional
-colon that terminates the "magic signature" can be omitted if the pattern
-begins with a character that cannot be a "magic signature" and is not a
-colon.</p></div>
+and the remainder is the pattern to match against the path.
+The "magic signature" consists of ASCII symbols that are neither
+alphanumeric, glob, regex special charaters nor colon.
+The optional colon that terminates the "magic signature" can be
+omitted if the pattern begins with a character that does not belong to
+"magic signature" symbol set and is not a colon.</p></div>
<div class="paragraph"><p>In the long form, the leading colon <code>:</code> is followed by a open
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.</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>
<div class="openblock">
<div class="content">
<div class="dlist"><dl>
<dt class="hdlist1">
-top <code>/</code>
+top
</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.
+ The magic word <code>top</code> (magic signature: <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">
@@ -1393,13 +1395,18 @@ Other consecutive asterisks are considered invalid.
</li>
</ul></div>
</dd>
+<dt class="hdlist1">
+exclude
+</dt>
+<dd>
+<p>
+ After a path matches any non-exclude pathspec, it will be run
+ through all exclude pathspec (magic signature: <code>!</code>). If it
+ matches, the path is ignored.
+</p>
+</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>
<dt class="hdlist1">
<a id="def_parent"></a>parent