diff options
| author | Dan McGee <dpmcgee@gmail.com> | 2007-12-29 06:20:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-07 02:41:44 (GMT) |
| commit | 5162e69732d13dd079919a389a6ace8878aad716 (patch) | |
| tree | 18758df98847d563bfa4a1d87a0998ff010c95ed /Documentation/git-status.txt | |
| parent | 5f8bee5859a82144fc03feee2cc99288eb923d9d (diff) | |
| download | git-5162e69732d13dd079919a389a6ace8878aad716.zip git-5162e69732d13dd079919a389a6ace8878aad716.tar.gz git-5162e69732d13dd079919a389a6ace8878aad716.tar.bz2 | |
Documentation: rename gitlink macro to linkgit
Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock
Asciidoc configuration:
@@ -149,7 +153,10 @@
# Inline macros.
# Backslash prefix required for escape processing.
# (?s) re flag for line spanning.
-(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])=
+
+# Explicit so they can be nested.
+(?su)[\\]?(?P<name>(http|https|ftp|file|mailto|callto|image|link)):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])=
+
# Anchor: [[[id]]]. Bibliographic anchor.
(?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3
# Anchor: [[id,xreflabel]]
This default regex now matches explicit values, and unfortunately in this
case gitlink was being matched by just 'link', causing the wrong inline
macro template to be applied. By renaming the macro, we can avoid being
matched by the wrong regex.
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-status.txt')
| -rw-r--r-- | Documentation/git-status.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 5c5a480..3ea269a 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -15,7 +15,7 @@ DESCRIPTION Displays paths that have differences between the index file and the current HEAD commit, paths that have differences between the working tree and the index file, and paths in the working tree that are not -tracked by git (and are not ignored by gitlink:gitignore[5]). The first +tracked by git (and are not ignored by linkgit:gitignore[5]). The first are what you _would_ commit by running `git commit`; the second and third are what you _could_ commit by running `git add` before running `git commit`. @@ -54,7 +54,7 @@ directory. See Also -------- -gitlink:gitignore[5] +linkgit:gitignore[5] Author ------ @@ -67,4 +67,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the gitlink:git[7] suite +Part of the linkgit:git[7] suite |