git-merge-cache -o does all the automerges in a single shot
commit2a45925180152b3e54248de4d7f69e8cc5c4051f
authorPetr Baudis <pasky@ucw.cz>
Wed, 11 May 2005 02:44:59 +0000 (11 04:44 +0200)
committerPetr Baudis <xpasky@machine.sinus.cz>
Wed, 11 May 2005 02:44:59 +0000 (11 04:44 +0200)
tree82375db1dc4f3a63130edb16637f1b0a2f84d150
parentf7ec43ae2257241ef76a69d9d3df031a181f6ebb
git-merge-cache -o does all the automerges in a single shot

When you pass git-merge-cache the -o option, it tries to do all the
automatic merges and possibly return error if any of them failed, instead
of the default behaviour of failing immediately after the first failed
automatic merge.

Ported from the Cogito branch - Cogito needs this behaviour.
merge-cache.c