X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=60306429fb7cad45e063cef8f70fc79005df7f70;hb=b17e659dd4007cb1d3eb5ac32b524c0c5ab59601;hp=d072fdaa4f74a6508abcae17001b1321c73bb000;hpb=d06b689a933f6d2130f8afdf1ac0ddb83eeb59ab;p=git.git diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index d072fdaa..60306429 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. @@ -23,7 +23,7 @@ OPTIONS Interpret all following arguments as filenames. -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