X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-index.txt;h=0cf505ea84d231e4e4997676d4169c5c5c7dd9f9;hb=f5c589f1dfff428a05b8783688513fe9f98309a2;hp=d072fdaa4f74a6508abcae17001b1321c73bb000;hpb=8ac3a61f59173d4a9a328518be83a25df610a5ef;p=git.git diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index d072fdaa4..0cf505ea8 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -8,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 @@ -40,8 +40,8 @@ If "git-merge-index" is called with multiple s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code. -Typically this is run with the a script calling the merge command from -the RCS package. +Typically this is run with the a script calling git's imitation of +the merge command from the RCS package. A sample script called "git-merge-one-file" is included in the distribution. @@ -69,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).