summaryrefslogtreecommitdiff
path: root/Documentation/git-show.txt
diff options
context:
space:
mode:
authorDan McGee <dpmcgee@gmail.com>2007-12-29 00:20:38 -0600
committerJunio C Hamano <gitster@pobox.com>2008-01-06 18:41:44 -0800
commit5162e69732d13dd079919a389a6ace8878aad716 (patch)
tree18758df98847d563bfa4a1d87a0998ff010c95ed /Documentation/git-show.txt
parent5f8bee5859a82144fc03feee2cc99288eb923d9d (diff)
downloadgit-5162e69732d13dd079919a389a6ace8878aad716.tar.gz
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-show.txt')
-rw-r--r--Documentation/git-show.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index a42e121150..dccf0e20ec 100644
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -20,12 +20,12 @@ presents the merge commit in a special format as produced by
For tags, it shows the tag message and the referenced objects.
-For trees, it shows the names (equivalent to gitlink:git-ls-tree[1]
+For trees, it shows the names (equivalent to linkgit:git-ls-tree[1]
with \--name-only).
For plain blobs, it shows the plain contents.
-The command takes options applicable to the gitlink:git-diff-tree[1] command to
+The command takes options applicable to the linkgit:git-diff-tree[1] command to
control how the changes the commit introduces are shown.
This manual page describes only the most frequently used options.
@@ -36,7 +36,7 @@ OPTIONS
<object>::
The name of the object to show.
For a more complete list of ways to spell object names, see
- "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
+ "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
include::pretty-options.txt[]
@@ -83,4 +83,4 @@ This manual page is a stub. You can help the git documentation by expanding it.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite