From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 May 2015 20:17:56 +0000 (-0700)
Subject: Merge branch 'ph/rebase-i-redo'
X-Git-Tag: v2.5.0-rc0~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eae0216646039b203cd60c4294ef79f805fbd696;p=git

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
---

eae0216646039b203cd60c4294ef79f805fbd696