summaryrefslogtreecommitdiff
path: root/Documentation/git-archimport.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-23 21:20:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-24 16:48:20 (GMT)
commit2839478774f48074d7d87b8a9838827742a5b058 (patch)
treef883af92b0d36789220ea5e38c128be66edf099b /Documentation/git-archimport.txt
parent22e5e58a3c75b73764b860907e4d871195f276ac (diff)
downloadgit-2839478774f48074d7d87b8a9838827742a5b058.zip
git-2839478774f48074d7d87b8a9838827742a5b058.tar.gz
git-2839478774f48074d7d87b8a9838827742a5b058.tar.bz2
Work around em-dash handling in newer AsciiDoc
Older versions of AsciiDoc used to literally pass double dashes when we used them in our linkgit macros and manpage titles, but newer ones (the issue was first reported with AsciiDoc 8.5.2) turn them into em dashes. Define litdd (literal double-dash) custom attribute in asciidoc.conf to work this around. While we are at it, fix a few double-dashes (e.g. the description of "project--devo--version" convention used by tla, among other things) that used to be incorrectly written as em dashes in the body text to also use this attribute. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-archimport.txt')
-rw-r--r--Documentation/git-archimport.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt
index 4d4325f..4f358c8 100644
--- a/Documentation/git-archimport.txt
+++ b/Documentation/git-archimport.txt
@@ -44,7 +44,7 @@ archives that it imports, it is also possible to specify git branch names
manually. To do so, write a git branch name after each <archive/branch>
parameter, separated by a colon. This way, you can shorten the Arch
branch names and convert Arch jargon to git jargon, for example mapping a
-"PROJECT--devo--VERSION" branch to "master".
+"PROJECT{litdd}devo{litdd}VERSION" branch to "master".
Associating multiple Arch branches to one git branch is possible; the
result will make the most sense only if no commits are made to the first
@@ -85,8 +85,8 @@ OPTIONS
-o::
Use this for compatibility with old-style branch names used by
earlier versions of 'git archimport'. Old-style branch names
- were category--branch, whereas new-style branch names are
- archive,category--branch--version. In both cases, names given
+ were category{litdd}branch, whereas new-style branch names are
+ archive,category{litdd}branch{litdd}version. In both cases, names given
on the command-line will override the automatically-generated
ones.