| commit | 91e525989665d69ace11b8f39618b1e8004fe19a | |
| author | Christian Couder <chriscool@tuxfamily.org> | |
| Wed, 31 Mar 2010 19:22:08 +0000 (31 21:22 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 1 Apr 2010 18:14:11 +0000 (1 11:14 -0700) | ||
| tree | 11e5ea3dc5fb54006f8ac74d6d739be52eb4c47e | treesnapshot (tar.gz zip) |
| parent | c674d0527396e4100454e8992ed7381ee29dd54e | commitdiff |
revert: add "--strategy" option to choose merge strategy
This patch makes it possible to use a different merge strategy when
cherry-picking. This is usefull mainly for debugging purposes as it
allows to see if some failures are caused by the merge strategy used or
not.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This patch makes it possible to use a different merge strategy when
cherry-picking. This is usefull mainly for debugging purposes as it
allows to see if some failures are caused by the merge strategy used or
not.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/revert.c | diffblobblamehistory |