diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-19 13:17:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-19 13:17:56 -0700 |
| commit | eae0216646039b203cd60c4294ef79f805fbd696 (patch) | |
| tree | b374774c4f0e3c7923123babf06de68e2dfd9188 /builtin/merge.c | |
| parent | 072f391c53cb6845777f01db03d9b06c33ac87e3 (diff) | |
| parent | 8cbc57ca1109ba455c6098654b7d732a01fd89fd (diff) | |
| download | git-eae0216646039b203cd60c4294ef79f805fbd696.tar.gz git-eae0216646039b203cd60c4294ef79f805fbd696.tar.xz | |
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
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions