index 343607cf9a8da1319c7ffc1d0c1068c0b2276bcf..3fb4d492b1d5c6aa62824872a414dbdf429d077f 100644 (file)
SYNOPSIS
--------
-'git-merge-cache' <merge-program> (-a | -- | <file>\*)
+'git-merge-cache' [-o] <merge-program> (-a | -- | <file>\*)
DESCRIPTION
-----------
-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.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
+One-shot merge by Petr Baudis <pasky@ucw.cz>
Documentation
--------------