X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=fbc986aa84d180d304a35a94dcd1f80e6a848b80;hb=3ac0ebbba4d2d47ca2f4a674afead830f76ca256;hp=60306429fb7cad45e063cef8f70fc79005df7f70;hpb=f7a2eb735982e921ae4379f1dcf5f7a023610393;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.