X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=6cd060108292733725aca28cc8f0b83aa7d0f56e;hb=c0d4822268d30b1668e94986a845b8bb5441e8b3;hp=5caee90adc43d2f59893f3e59fda23b5a05462a9;hpb=7fe2fc79358673a909d71e62d3f80ffe0f525fce;p=git.git diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 5caee90a..6cd06010 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 ---- @@ -9,22 +8,22 @@ git-merge-index - Runs a merge for files needing merging SYNOPSIS -------- -'git-merge-index' [-o] [-q] (-a | -- | \*) +'git-merge-index' [-o] [-q] (-a | \-- | \*) 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. 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 @@ -70,7 +69,7 @@ or fatal: merge program failed where the latter example shows how "git-merge-index" will stop trying to -merge once anything has returned an error (ie "cat" returned an error +merge once anything has returned an error (i.e., "cat" returned an error for the AA file, because it didn't exist in the original, and thus "git-merge-index" didn't even try to merge the MM thing).