| commit | 52b48ef1e40fc2b996e3d3f9cad3d096482d8e49 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Mon, 16 Aug 2010 01:11:06 +0000 (15 20:11 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Aug 2010 03:09:48 +0000 (15 20:09 -0700) | ||
| tree | e92210896905c78651102470a028db2c78aa6e46 | treesnapshot (tar.gz zip) |
| parent | 6209036c7843f4095c04b5ecc13199cc4eccaf3f | commitdiff |
merge: let custom strategies intervene in trivial merges
As v1.6.1-rc1~294^2 (2008-08-23) explains, custom merge strategies
do not even kick in when the merge is truly trivial. But they
should, since otherwise a custom “--strategy=theirs” is not useful.
Perhaps custom strategies should not allow fast-forward either. This
patch does not make that change, since it is less important (because
it is always possible to explicitly use --no-ff).
Reported-by: Yaroslav Halchenko <debian@onerussian.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
As v1.6.1-rc1~294^2 (2008-08-23) explains, custom merge strategies
do not even kick in when the merge is truly trivial. But they
should, since otherwise a custom “--strategy=theirs” is not useful.
Perhaps custom strategies should not allow fast-forward either. This
patch does not make that change, since it is less important (because
it is always possible to explicitly use --no-ff).
Reported-by: Yaroslav Halchenko <debian@onerussian.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory | |
| t/t7606-merge-custom.sh | diffblobblamehistory |