sequencer: do not squash 'reword' commits when we hit conflicts
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Tue, 19 Jun 2018 12:46:51 +0000 (13:46 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jun 2018 17:26:41 +0000 (10:26 -0700)
commita9279c6...8588a12485a8afa424036bdb5ad0534d
treebdb2519...3c53f99d49964b0fb8141e6570d68a5ecopy hash to clipboard (tree)
parentf0ac6e3...433c1d7e9339207aa4d01e9bf7a05b8acopy hash to clipboard (diff)
sequencer.c
t/t3404-rebase-interactive.sh
t/t3423-rebase-reword.sh [new file with mode: 0755]