Merge branch 'pw/rebase-abort-clean-rewritten' into maint
commit649cae69bc8cc99fd5a9e72f8a08ae301d0d5e16
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:20 +0000 (29 12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:20 +0000 (29 12:38 -0700)
treedacfd5d2a4738af3ffffd3215f9cb2fd090336e7
parent39521d07bedc4a8f1f8891ff1bc0a5b34213504f
parentd559f502c59658ea1f360fd28d8909894e40a4fe
Merge branch 'pw/rebase-abort-clean-rewritten' into maint

"git rebase --abort" used to leave refs/rewritten/ when concluding
"git rebase -r", which has been corrected.

* pw/rebase-abort-clean-rewritten:
  rebase --abort/--quit: cleanup refs/rewritten
  sequencer: return errors from sequencer_remove_state()
  rebase: warn if state directory cannot be removed
  rebase: fix a memory leak
builtin/rebase.c
sequencer.c
t/t3430-rebase-merges.sh