summaryrefslogtreecommitdiff
path: root/builtin/fast-export.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-15 20:11:06 -0500
committerJunio C Hamano <gitster@pobox.com>2010-08-15 20:09:48 -0700
commit52b48ef1e40fc2b996e3d3f9cad3d096482d8e49 (patch)
treee92210896905c78651102470a028db2c78aa6e46 /builtin/fast-export.c
parent6209036c7843f4095c04b5ecc13199cc4eccaf3f (diff)
downloadgit-52b48ef1e40fc2b996e3d3f9cad3d096482d8e49.tar.gz
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>
Diffstat (limited to 'builtin/fast-export.c')
0 files changed, 0 insertions, 0 deletions