Merge branch 'ph/rebase-i-redo'
commiteae0216646039b203cd60c4294ef79f805fbd696
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 May 2015 20:17:56 +0000 (19 13:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 May 2015 20:17:56 +0000 (19 13:17 -0700)
treeb374774c4f0e3c7923123babf06de68e2dfd9188
parent072f391c53cb6845777f01db03d9b06c33ac87e3
parent8cbc57ca1109ba455c6098654b7d732a01fd89fd
Merge branch 'ph/rebase-i-redo'

"git rebase -i" moved the "current" command from "todo" to "done" a
bit too prematurely, losing a step when a "pick" did not even start.

* ph/rebase-i-redo:
  rebase -i: redo tasks that die during cherry-pick
git-rebase--interactive.sh
t/t3404-rebase-interactive.sh