summaryrefslogtreecommitdiff
path: root/Documentation/git-index-pack.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-index-pack.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-index-pack.txt')
-rw-r--r--Documentation/git-index-pack.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt
index 042c217..72b5d00 100644
--- a/Documentation/git-index-pack.txt
+++ b/Documentation/git-index-pack.txt
@@ -43,10 +43,10 @@ OPTIONS
a default name determined from the pack content. If
<pack-file> is not specified consider using --keep to
prevent a race condition between this process and
- gitlink:git-repack[1].
+ linkgit:git-repack[1].
--fix-thin::
- It is possible for gitlink:git-pack-objects[1] to build
+ It is possible for linkgit:git-pack-objects[1] to build
"thin" pack, which records objects in deltified form based on
objects not included in the pack to reduce network traffic.
Those objects are expected to be present on the receiving end
@@ -59,7 +59,7 @@ OPTIONS
Before moving the index into its final destination
create an empty .keep file for the associated pack file.
This option is usually necessary with --stdin to prevent a
- simultaneous gitlink:git-repack[1] process from deleting
+ simultaneous linkgit:git-repack[1] process from deleting
the newly constructed pack and index before refs can be
updated to use objects contained in the pack.
@@ -83,7 +83,7 @@ Once the index has been created, the list of object names is sorted
and the SHA1 hash of that list is printed to stdout. If --stdin was
also used then this is prefixed by either "pack\t", or "keep\t" if a
new .keep file was successfully created. This is useful to remove a
-.keep file used as a lock to prevent the race with gitlink:git-repack[1]
+.keep file used as a lock to prevent the race with linkgit:git-repack[1]
mentioned above.
@@ -97,4 +97,4 @@ Documentation by Sergey Vlasov
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite