summaryrefslogtreecommitdiffstats
path: root/gitglossary.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-17 14:07:26 -0700
committerJunio C Hamano <gitster@pobox.com>2017-03-17 14:07:26 -0700
commit3d4a66d7358fa82107049059acd4d5defbe3d470 (patch)
treefb3e95971120da26ec02d490caae437a2098c7fe /gitglossary.html
parentfe1f8a0cb581e500a90f33b456678567befe763d (diff)
downloadgit-htmldocs-3d4a66d7358fa82107049059acd4d5defbe3d470.tar.gz
Autogenerated HTML docs for v2.12.0-399-g9d77b
Diffstat (limited to 'gitglossary.html')
-rw-r--r--gitglossary.html38
1 files changed, 38 insertions, 0 deletions
diff --git a/gitglossary.html b/gitglossary.html
index 6b48a6b3a..4ab17123f 100644
--- a/gitglossary.html
+++ b/gitglossary.html
@@ -1401,6 +1401,44 @@ Other consecutive asterisks are considered invalid.
</ul></div>
</dd>
<dt class="hdlist1">
+attr
+</dt>
+<dd>
+<p>
+After <code>attr:</code> comes a space separated list of "attribute
+requirements", all of which must be met in order for the
+path to be considered a match; this is in addition to the
+usual non-magic pathspec pattern matching.
+See <a href="gitattributes.html">gitattributes(5)</a>.
+</p>
+<div class="paragraph"><p>Each of the attribute requirements for the path takes one of
+these forms:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+"<code>ATTR</code>" requires that the attribute <code>ATTR</code> be set.
+</p>
+</li>
+<li>
+<p>
+"<code>-ATTR</code>" requires that the attribute <code>ATTR</code> be unset.
+</p>
+</li>
+<li>
+<p>
+"<code>ATTR=VALUE</code>" requires that the attribute <code>ATTR</code> be
+ set to the string <code>VALUE</code>.
+</p>
+</li>
+<li>
+<p>
+"<code>!ATTR</code>" requires that the attribute <code>ATTR</code> be
+ unspecified.
+</p>
+</li>
+</ul></div>
+</dd>
+<dt class="hdlist1">
exclude
</dt>
<dd>