| commit | 3f735b66543a2221c218fc522272d62a333ebfec | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Mon, 12 Nov 2007 13:11:46 +0000 (12 13:11 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Nov 2007 00:23:09 +0000 (12 16:23 -0800) | ||
| tree | 44e269a15943f3fd29db72fe9bddfde1dd05d268 | treesnapshot (tar.gz zip) |
| parent | 6fd2f5e60d4d574ff9e5dd8ce1e229328c785d69 | commitdiff |
rebase: fix "rebase --continue" breakage
The --skip case was handled properly when rebasing without --merge,
but the --continue case was not.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The --skip case was handled properly when rebasing without --merge,
but the --continue case was not.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase.sh | diffblobblamehistory | |
| t/t3403-rebase-skip.sh | diffblobblamehistory |