X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=332e023d0f14be813ead6cb6915938910ea3a719;hb=b9895c06882c0e395a2d22c3649e53bd342b535e;hp=60306429fb7cad45e063cef8f70fc79005df7f70;hpb=5f3aa197ac03eabbc45046cd3b9dbcfbda0426d9;p=git.git

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 60306429..332e023d 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,8 +19,8 @@ files are passed as arguments 5, 6 and 7.
 
 OPTIONS
 -------
---::
-	Interpret all following arguments as filenames.
+\--::
+	Do not interpret any more arguments as options.
 
 -a::
 	Run merge against all files in the index that need merging.