aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-20 05:31:58 -0500
committerJunio C Hamano <gitster@pobox.com>2010-08-20 14:16:22 -0700
commit12378c0aa8d06cb0e965935ca6d393a9b66b095a (patch)
treea160d1ed0d467fe3ac6308ff2460a047f7a28989 /Documentation/git-merge-index.txt
parent9257a1efe1f8a0e8244da6f4a4d8178fbb41699d (diff)
downloadgit-12378c0aa8d06cb0e965935ca6d393a9b66b095a.tar.gz
Documentation: remove backslashes in manpage synopses
For some reason, various manual pages have an asterisk escaped with \ in the synopsis. Since there is no other asterisk to pair it with, Asciidoc does not consider this asterisk escapable, so it passes the backslash through. Each page either uses [verse] or has only one asterisk, so it is safe to drop the backslashes (checked with asciidoc 8.5.2). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-index.txt')
-rw-r--r--Documentation/git-merge-index.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 4d266de9cc..921b38f183 100644
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -8,7 +8,7 @@ git-merge-index - Run 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
-----------