X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge-cache.txt;h=bd3c9ca75f4267a32a8efc852bbfc97b3f06db9d;hb=ff3412ee1f74cc267e6d65c03c5fd8ea2214fbe7;hp=343607cf9a8da1319c7ffc1d0c1068c0b2276bcf;hpb=f1a7eb36b017c62d9a007b6b8660bdeec3f94f97;p=git.git diff --git a/Documentation/git-merge-cache.txt b/Documentation/git-merge-cache.txt index 343607cf..bd3c9ca7 100644 --- a/Documentation/git-merge-cache.txt +++ b/Documentation/git-merge-cache.txt @@ -9,7 +9,7 @@ git-merge-cache - Runs a merge for files needing merging SYNOPSIS -------- -'git-merge-cache' (-a | -- | \*) +'git-merge-cache' [-o] [-q] (-a | -- | \*) DESCRIPTION ----------- @@ -21,11 +21,22 @@ files are passed as arguments 5, 6 and 7. OPTIONS ------- --:: - Interpret all future arguments as filenames. + Interpret all following arguments as filenames. -a:: Run merge against all files in the cache that need merging. +-o:: + Instead of stopping at the first failed merge, do all of them + in one shot - continue with merging even when previous merges + returned errors, and only return the error code after all the + merges are over. + +-q:: + Do not complain about failed merge program (the merge program + failure usually indicates conflicts during merge). This is for + porcelains which might want to emit custom messages. + If "git-merge-cache" is called with multiple s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code. @@ -34,7 +45,7 @@ Typically this is run with the a script calling the merge command from the RCS package. A sample script called "git-merge-one-file-script" is included in the -ditribution. +distribution. ALERT ALERT ALERT! The git "merge object order" is different from the RCS "merge" program merge object order. In the above ordering, the @@ -66,6 +77,7 @@ for the AA file, because it didn't exist in the original, and thus Author ------ Written by Linus Torvalds +One-shot merge by Petr Baudis Documentation --------------