Merge branches 'jc/clone' and 'jc/name'

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 60306429fb7cad45e063cef8f70fc79005df7f70..fbc986aa84d180d304a35a94dcd1f80e6a848b80 100644 (file)
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -20,7 +20,7 @@ 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.