X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=fbc986aa84d180d304a35a94dcd1f80e6a848b80;hb=e23d0b4a4a55cc07e133905f0e9526b3550dd61b;hp=d072fdaa4f74a6508abcae17001b1321c73bb000;hpb=f51248eb482a7a0feacb04d02119c94d35845975;p=git.git diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index d072fdaa..fbc986aa 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -12,7 +12,7 @@ SYNOPSIS DESCRIPTION ----------- -This looks up the (s) in the cache and, if there are any merge +This looks up the (s) in the index and, if there are any merge entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty argument if no file), and as argument 4. File modes for the three files are passed as arguments 5, 6 and 7. @@ -20,10 +20,10 @@ 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 cache that need merging. + Run merge against all files in the index that need merging. -o:: Instead of stopping at the first failed merge, do all of them