| commit | c7b4de2cc549477be8e4eb2c0077f045e80a6d17 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Jun 2015 19:00:10 +0000 (5 12:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Jun 2015 19:00:10 +0000 (5 12:00 -0700) | ||
| tree | 648d1a2b49ae8c65f914ad1d41a0aa7ad5cc270d | treesnapshot (tar.gz zip) |
| parent | 8d5ef5a0d1da18a2eb55c976720a8e96642c1b0b | commitdiff |
| parent | 8cbc57ca1109ba455c6098654b7d732a01fd89fd | commitdiff |
Merge branch 'ph/rebase-i-redo' into maint
"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
| t/t3404-rebase-interactive.sh | diff1 | diff2 | blobhistory |