summaryrefslogtreecommitdiff
path: root/Documentation/git-citool.txt
diff options
context:
space:
mode:
authorDan McGee <dpmcgee@gmail.com>2007-12-29 06:20:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-07 02:41:44 (GMT)
commit5162e69732d13dd079919a389a6ace8878aad716 (patch)
tree18758df98847d563bfa4a1d87a0998ff010c95ed /Documentation/git-citool.txt
parent5f8bee5859a82144fc03feee2cc99288eb923d9d (diff)
downloadgit-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-citool.txt')
-rw-r--r--Documentation/git-citool.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-citool.txt b/Documentation/git-citool.txt
index 5217ab2..aca1d75 100644
--- a/Documentation/git-citool.txt
+++ b/Documentation/git-citool.txt
@@ -14,10 +14,10 @@ DESCRIPTION
A Tcl/Tk based graphical interface to review modified files, stage
them into the index, enter a commit message and record the new
commit onto the current branch. This interface is an alternative
-to the less interactive gitlink:git-commit[1] program.
+to the less interactive linkgit:git-commit[1] program.
git-citool is actually a standard alias for 'git gui citool'.
-See gitlink:git-gui[1] for more details.
+See linkgit:git-gui[1] for more details.
Author
------
@@ -29,4 +29,4 @@ Documentation by Shawn O. Pearce <spearce@spearce.org>.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite