projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e7d3dd2) | patch
Make merge-cache not fail immediatelly when the merge program
authorPetr Baudis <pasky@ucw.cz>
Tue, 19 Apr 2005 02:16:15 +0000 (04:16 +0200)
committerPetr Baudis <xpasky@machine.sinus.cz>
Sat, 7 May 2005 14:09:44 +0000 (16:09 +0200)
commit8c59926f5e00082a4cbf1d9f31275917c5f7f001
tree1e6bdd60480e6bc46522377ba965827f22729062tree | snapshot
parente7d3dd248f50501f98b29c917e70bddcf3ea925acommit | diff
Make merge-cache not fail immediatelly when the merge program
fails, but go on and return error code at the end. It makes sense
to try to merge everything, then let the user solve the commits
at once.
merge-cache.c diff | blob | history
The core git plumbing