projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6fd2f5e) | patch
rebase: fix "rebase --continue" breakage
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Mon, 12 Nov 2007 13:11:46 +0000 (13:11 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Nov 2007 00:23:09 +0000 (16:23 -0800)
commit3f735b66543a2221c218fc522272d62a333ebfec
tree44e269a15943f3fd29db72fe9bddfde1dd05d268tree | snapshot
parent6fd2f5e60d4d574ff9e5dd8ce1e229328c785d69commit | diff
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>
git-rebase.sh diff | blob | history
t/t3403-rebase-skip.sh diff | blob | history
Git—the stupid content tracker