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

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 60306429..fbc986aa 100644
--- 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.