rebase --rebase-merges: add support for octopus merges
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 21 Dec 2017 14:52:45 +0000 (15:52 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2018 21:52:30 +0000 (14:52 -0700)
commit2b6ad0f...bca508a04e2b6e940e37f7d98c1a8696
tree2d40db4...5cbea7e9b58864db8fb6fbadcb9aa0ebcopy hash to clipboard (tree)
parent920f22e...bc2ddc28b1d70eb8167fe17f0f1601ebcopy hash to clipboard (diff)
sequencer.c
t/t3430-rebase-merges.sh