glossary-content.txt: rephrase magic signature part
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Dec 6, 2013 at 14:30 UTC
8b7cb51a9dda0debf48c62ae79b9d60a23507097
1 file changed
+12
-17
Documentation/glossary-content.txt
+12
-17
@@ -323,24 +323,26 @@ including Documentation/chapter_1/figure_1.jpg.
323
A pathspec that begins with a colon `:` has special meaning. In the
324
short form, the leading colon `:` is followed by zero or more "magic
325
signature" letters (which optionally is terminated by another colon `:`),
326
-and the remainder is the pattern to match against the path. The optional
327
-colon that terminates the "magic signature" can be omitted if the pattern
328
-begins with a character that cannot be a "magic signature" and is not a
329
-colon.
326
+and the remainder is the pattern to match against the path.
327
+The "magic signature" consists of ASCII symbols that are neither
328
+alphanumeric, glob, regex special charaters nor colon.
329
+The optional colon that terminates the "magic signature" can be
330
+omitted if the pattern begins with a character that does not belong to
331
+"magic signature" symbol set and is not a colon.
332
+
333
In the long form, the leading colon `:` is followed by a open
334
parenthesis `(`, a comma-separated list of zero or more "magic words",
335
and a close parentheses `)`, and the remainder is the pattern to match
336
against the path.
337
+
336
-The "magic signature" consists of an ASCII symbol that is not
337
-alphanumeric.
338
+A pathspec with only a colon means "there is no pathspec". This form
339
+should not be combined with other pathspec.
340
+
341
--
340
-top `/`;;
341
- The magic word `top` (mnemonic: `/`) makes the pattern match
342
- from the root of the working tree, even when you are running
343
- the command from inside a subdirectory.
342
+top;;
343
+ The magic word `top` (magic signature: `/`) makes the pattern
344
+ match from the root of the working tree, even when you are
345
+ running the command from inside a subdirectory.
346
347
literal;;
348
Wildcards in the pattern such as `*` or `?` are treated
@@ -378,13 +380,6 @@ full pathname may have special meaning:
380
+
381
Glob magic is incompatible with literal magic.
382
--
381
-+
382
-Currently only the slash `/` is recognized as the "magic signature",
383
-but it is envisioned that we will support more types of magic in later
384
-versions of Git.
385
-+
386
-A pathspec with only a colon means "there is no pathspec". This form
387
-should not be combined with other pathspec.
383
384
[[def_parent]]parent::
385
A <<def_commit_object,commit object>> contains a (possibly empty) list