mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glossary-content.txt: rephrase magic signature part

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2013-12-06 14:30:47 +07:00
committed by Junio C Hamano
parent 077f43447c
commit 8b7cb51a9d
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Documentation/glossary-content.txt
View File

@ -323,24 +323,26 @@ including Documentation/chapter_1/figure_1.jpg.
A pathspec that begins with a colon `:` has special meaning. In the A pathspec that begins with a colon `:` has special meaning. In the
short form, the leading colon `:` is followed by zero or more "magic short form, the leading colon `:` is followed by zero or more "magic
signature" letters (which optionally is terminated by another colon `:`), signature" letters (which optionally is terminated by another colon `:`),
and the remainder is the pattern to match against the path. The optional and the remainder is the pattern to match against the path.
colon that terminates the "magic signature" can be omitted if the pattern The "magic signature" consists of ASCII symbols that are neither
begins with a character that cannot be a "magic signature" and is not a alphanumeric, glob, regex special charaters nor colon.
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 In the long form, the leading colon `:` is followed by a open
parenthesis `(`, a comma-separated list of zero or more "magic words", parenthesis `(`, a comma-separated list of zero or more "magic words",
and a close parentheses `)`, and the remainder is the pattern to match and a close parentheses `)`, and the remainder is the pattern to match
against the path. against the path.
+ +
The "magic signature" consists of an ASCII symbol that is not A pathspec with only a colon means "there is no pathspec". This form
alphanumeric. should not be combined with other pathspec.
+ +
-- --
top `/`;; top;;
The magic word `top` (mnemonic: `/`) makes the pattern match The magic word `top` (magic signature: `/`) makes the pattern
from the root of the working tree, even when you are running match from the root of the working tree, even when you are
the command from inside a subdirectory. running the command from inside a subdirectory.
literal;; literal;;
Wildcards in the pattern such as `*` or `?` are treated Wildcards in the pattern such as `*` or `?` are treated
@ -378,13 +380,6 @@ full pathname may have special meaning:
+ +
Glob magic is incompatible with literal magic. Glob magic is incompatible with literal magic.
-- --
+
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:: [[def_parent]]parent::
A <<def_commit_object,commit object>> contains a (possibly empty) list A <<def_commit_object,commit object>> contains a (possibly empty) list