summaryrefslogtreecommitdiffstats
path: root/glossary-content.txt
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 /glossary-content.txt
parent9906f1f2277410d5f7fedc74ded20e8490812568 (diff)
downloadgit-htmldocs-21bc18b3b222ee68dc0f58c7ff6c92fd44938b2d.tar.gz
Autogenerated HTML docs for v1.8.5.2-309-ga2501
Diffstat (limited to 'glossary-content.txt')
-rw-r--r--glossary-content.txt34
1 files changed, 17 insertions, 17 deletions
diff --git a/glossary-content.txt b/glossary-content.txt
index aa1c8880d..378306f58 100644
--- a/glossary-content.txt
+++ b/glossary-content.txt
@@ -323,24 +323,26 @@ including Documentation/chapter_1/figure_1.jpg.
A pathspec that begins with a colon `:` has special meaning. In the
short form, the leading colon `:` is followed by zero or more "magic
signature" letters (which optionally is terminated by another colon `:`),
-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.
+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.
+
In the long form, the leading colon `:` is followed by a open
parenthesis `(`, a comma-separated list of zero or more "magic words",
and a close parentheses `)`, and the remainder is the pattern to match
against the path.
+
-The "magic signature" consists of an ASCII symbol that is not
-alphanumeric.
+A pathspec with only a colon means "there is no pathspec". This form
+should not be combined with other pathspec.
+
--
-top `/`;;
- The magic word `top` (mnemonic: `/`) makes the pattern match
- from the root of the working tree, even when you are running
- the command from inside a subdirectory.
+top;;
+ The magic word `top` (magic signature: `/`) makes the pattern
+ match from the root of the working tree, even when you are
+ running the command from inside a subdirectory.
literal;;
Wildcards in the pattern such as `*` or `?` are treated
@@ -377,14 +379,12 @@ full pathname may have special meaning:
- Other consecutive asterisks are considered invalid.
+
Glob magic is incompatible with literal magic.
+
+exclude;;
+ After a path matches any non-exclude pathspec, it will be run
+ through all exclude pathspec (magic signature: `!`). If it
+ matches, the path is ignored.
--
-+
-Currently only the slash `/` is recognized as the "magic signature",
-but it is envisioned that we will support more types of magic in later
-versions of Git.
-+
-A pathspec with only a colon means "there is no pathspec". This form
-should not be combined with other pathspec.
[[def_parent]]parent::
A <<def_commit_object,commit object>> contains a (possibly empty) list