Merge branch 'maint'

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 60306429fb7cad45e063cef8f70fc79005df7f70..332e023d0f14be813ead6cb6915938910ea3a719 100644 (file)
--- 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.