X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=fbc986aa84d180d304a35a94dcd1f80e6a848b80;hb=070879ca93a7d358086f4c8aff4553493dcb9210;hp=5caee90adc43d2f59893f3e59fda23b5a05462a9;hpb=c1067050ce58b5b39f528fe634732da858664603;p=git.git diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 5caee90a..fbc986aa 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -1,6 +1,5 @@ git-merge-index(1) ================== -v0.1, May 2005 NAME ---- @@ -13,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. @@ -21,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