diff options
| author |  Petr Baudis <pasky@ucw.cz> | 2005-05-11 04:49:36 +0200 |
|---|---|---|
| committer |  Petr Baudis <xpasky@machine.sinus.cz> | 2005-05-11 04:49:36 +0200 |
| commit | 7ffeb8c24bb3eb83bf39e9d0348899f7f8178b2a (patch) | |
| tree | a5f8a0d3792dfc03b96e0a9240f8fe32de7e6748 /Documentation | |
| parent | git-merge-cache -o does all the automerges in a single shot (diff) | |
| download | tgif-7ffeb8c24bb3eb83bf39e9d0348899f7f8178b2a.tar.xz | |
Document git-merge-cache -o
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-merge-cache.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/git-merge-cache.txt b/Documentation/git-merge-cache.txt index 343607cf9a..3fb4d492b1 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' <merge-program> (-a | -- | <file>\*) +'git-merge-cache' [-o] <merge-program> (-a | -- | <file>\*) 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 <file>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 <torvalds@osdl.org> +One-shot merge by Petr Baudis <pasky@ucw.cz> Documentation -------------- |