| commit | 8fc1f525088ebe20d1cbc652555305eac61acf52 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 May 2015 20:21:03 +0000 (7 13:21 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 May 2015 20:21:03 +0000 (7 13:21 -0700) | ||
| tree | 89884795ddab7b61c875d25945724489fd03cb5e | treesnapshot (tar.gz zip) |
| parent | 849a24dfcb8ca5985e9f50bfa2cb8873fc60a5fb | commitdiff |
| parent | 8cbc57ca1109ba455c6098654b7d732a01fd89fd | commitdiff |
Merge branch 'ph/rebase-i-redo' into next
"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 -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 | diff1 | diff2 | blobhistory |
| t/t3404-rebase-interactive.sh | diff1 | diff2 | blobhistory |