rebase -r: support merge strategies other than `recursive`
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 31 Jul 2019 15:18:47 +0000 (08:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2019 19:24:07 +0000 (12:24 -0700)
commite145d99...478befd0db6999822aa31d422b283a3b
treeadf2795...b5199a27cef653ba7fa2f7d5f5baa508copy hash to clipboard (tree)
parent4e6023b...3ae1159277a7c3053f8d074c23456812copy hash to clipboard (diff)
Documentation/git-rebase.txt
builtin/rebase.c
sequencer.c
t/t3422-rebase-incompatible-options.sh
t/t3430-rebase-merges.sh