X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-cache.txt;h=bd3c9ca75f4267a32a8efc852bbfc97b3f06db9d;hb=78938b0d8a95b09d94af214fdb6b5f053a5edb98;hp=f1fbb5ddec3d37dbeff1d0b89ba61dfea8915350;hpb=bbd14cb0113ca26d679970f4db9ad953fb273e36;p=git.git diff --git a/Documentation/git-merge-cache.txt b/Documentation/git-merge-cache.txt index f1fbb5dd..bd3c9ca7 100644 --- a/Documentation/git-merge-cache.txt +++ b/Documentation/git-merge-cache.txt @@ -21,7 +21,7 @@ files are passed as arguments 5, 6 and 7. OPTIONS ------- --:: - Interpret all future arguments as filenames. + Interpret all following arguments as filenames. -a:: Run merge against all files in the cache that need merging.