Merge branch 'pw/rebase-abort-clean-rewritten' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:20 +0000 (12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:20 +0000 (12:38 -0700)
commit649cae6...bc8cc99fd5a9e72f8a08ae301d0d5e16
treedacfd5d...a4738af3ffffd3215f9cb2fd090336e7copy hash to clipboard (tree)
parent39521d0...bedc4a8f1f8891ff1bc0a5b34213504fcopy hash to clipboard (diff)
parentd559f50...c59658ea1f360fd28d8909894e40a4fecopy hash to clipboard (diff)
builtin/rebase.c
sequencer.c
t/t3430-rebase-merges.sh