From: Petr Baudis Date: Wed, 11 May 2005 02:49:36 +0000 (+0200) Subject: Document git-merge-cache -o X-Git-Tag: v0.99~598 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=7ffeb8c24bb3eb83bf39e9d0348899f7f8178b2a;p=git.git Document git-merge-cache -o --- diff --git a/Documentation/git-merge-cache.txt b/Documentation/git-merge-cache.txt index 343607cf..3fb4d492 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] (-a | -- | \*) DESCRIPTION ----------- @@ -26,6 +26,12 @@ OPTIONS -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. + 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. @@ -66,6 +72,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 --------------