summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorsean <seanlkml@sympatico.ca>2006-05-05 19:05:24 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-05 21:21:52 (GMT)
commite994004f93a481414b9065ac24edd0807d1c311e (patch)
treea7055636fbd71e0bde0c1ed55d85893e6f330af2 /Documentation/git-merge-index.txt
parent2b5f3ed3166ea7d93f4138bb2b6c849851ba86ac (diff)
downloadgit-e994004f93a481414b9065ac24edd0807d1c311e.zip
git-e994004f93a481414b9065ac24edd0807d1c311e.tar.gz
git-e994004f93a481414b9065ac24edd0807d1c311e.tar.bz2
Fix up docs where "--" isn't displayed correctly.
A bare "--" doesn't show up in man or html pages correctly as two individual dashes unless backslashed as \-- in the asciidoc source. Note, no backslash is needed inside a literal block. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge-index.txt')
-rw-r--r--Documentation/git-merge-index.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index fbc986a..332e023 100644
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -8,7 +8,7 @@ git-merge-index - Runs a merge for files needing merging
SYNOPSIS
--------
-'git-merge-index' [-o] [-q] <merge-program> (-a | -- | <file>\*)
+'git-merge-index' [-o] [-q] <merge-program> (-a | \-- | <file>\*)
DESCRIPTION
-----------
@@ -19,7 +19,7 @@ files are passed as arguments 5, 6 and 7.
OPTIONS
-------
---::
+\--::
Do not interpret any more arguments as options.
-a::