summaryrefslogtreecommitdiffstats
path: root/glossary-content.txt
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 /glossary-content.txt
parentfe1f8a0cb581e500a90f33b456678567befe763d (diff)
downloadgit-htmldocs-3d4a66d7358fa82107049059acd4d5defbe3d470.tar.gz
Autogenerated HTML docs for v2.12.0-399-g9d77b
Diffstat (limited to 'glossary-content.txt')
-rw-r--r--glossary-content.txt21
1 files changed, 21 insertions, 0 deletions
diff --git a/glossary-content.txt b/glossary-content.txt
index fc9320e59..6e991c246 100644
--- a/glossary-content.txt
+++ b/glossary-content.txt
@@ -384,6 +384,27 @@ full pathname may have special meaning:
+
Glob magic is incompatible with literal magic.
+attr;;
+After `attr:` 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 linkgit:gitattributes[5].
++
+Each of the attribute requirements for the path takes one of
+these forms:
+
+- "`ATTR`" requires that the attribute `ATTR` be set.
+
+- "`-ATTR`" requires that the attribute `ATTR` be unset.
+
+- "`ATTR=VALUE`" requires that the attribute `ATTR` be
+ set to the string `VALUE`.
+
+- "`!ATTR`" requires that the attribute `ATTR` be
+ unspecified.
++
+
exclude;;
After a path matches any non-exclude pathspec, it will be run
through all exclude pathspec (magic signature: `!` or its