diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-11-12 13:11:46 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-12 16:23:09 -0800 |
| commit | 3f735b66543a2221c218fc522272d62a333ebfec (patch) | |
| tree | 44e269a15943f3fd29db72fe9bddfde1dd05d268 /git-rebase.sh | |
| parent | 6fd2f5e60d4d574ff9e5dd8ce1e229328c785d69 (diff) | |
| download | git-3f735b66543a2221c218fc522272d62a333ebfec.tar.gz | |
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>
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index c02be31f33..c059749bbd 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -170,7 +170,11 @@ do finish_rb_merge exit fi - git am --resolved --3way --resolvemsg="$RESOLVEMSG" + head_name=$(cat .dotest/head-name) && + onto=$(cat .dotest/onto) && + orig_head=$(cat .dotest/orig-head) && + git am --resolved --3way --resolvemsg="$RESOLVEMSG" && + move_to_original_branch exit ;; --skip) |