X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=60306429fb7cad45e063cef8f70fc79005df7f70;hb=49ccb0877f64308662669a09db7b221419c13d0a;hp=5caee90adc43d2f59893f3e59fda23b5a05462a9;hpb=dbc37438687e110697574d175e4eca5f9cbeae81;p=git.git diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 5caee90a..60306429 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. @@ -24,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