X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=6cd060108292733725aca28cc8f0b83aa7d0f56e;hb=ae448e3854d8b6e7e37aa88fa3917f5dd97f3210;hp=60306429fb7cad45e063cef8f70fc79005df7f70;hpb=56fc63193975edd4b9f520b6c65c2b97ecd8ee38;p=git.git

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 60306429..6cd06010 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.
@@ -69,7 +69,7 @@ or
   fatal: merge program failed
 
 where the latter example shows how "git-merge-index" will stop trying to
-merge once anything has returned an error (ie "cat" returned an error
+merge once anything has returned an error (i.e., "cat" returned an error
 for the AA file, because it didn't exist in the original, and thus
 "git-merge-index" didn't even try to merge the MM thing).