summaryrefslogtreecommitdiff
path: root/Documentation/git-fast-export.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-fast-export.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-fast-export.txt')
-rw-r--r--Documentation/git-fast-export.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt
index fd3d571..6dac475 100644
--- a/Documentation/git-fast-export.txt
+++ b/Documentation/git-fast-export.txt
@@ -13,18 +13,18 @@ SYNOPSIS
DESCRIPTION
-----------
This program dumps the given revisions in a form suitable to be piped
-into gitlink:git-fast-import[1].
+into linkgit:git-fast-import[1].
You can use it as a human readable bundle replacement (see
-gitlink:git-bundle[1]), or as a kind of an interactive
-gitlink:git-filter-branch[1].
+linkgit:git-bundle[1]), or as a kind of an interactive
+linkgit:git-filter-branch[1].
OPTIONS
-------
--progress=<n>::
Insert 'progress' statements every <n> objects, to be shown by
- gitlink:git-fast-import[1] during import.
+ linkgit:git-fast-import[1] during import.
--signed-tags=(verbatim|warn|strip|abort)::
Specify how to handle signed tags. Since any transformation
@@ -65,7 +65,7 @@ referenced by that revision range contains the string
Limitations
-----------
-Since gitlink:git-fast-import[1] cannot tag trees, you will not be
+Since linkgit:git-fast-import[1] cannot tag trees, you will not be
able to export the linux-2.6.git repository completely, as it contains
a tag referencing a tree instead of a commit.
@@ -80,4 +80,4 @@ Documentation by Johannes E. Schindelin <johannes.schindelin@gmx.de>.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite