| commit | 729ec9e23a13a0610a19a24901d0ab5e2bc44a12 | |
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
| Sun, 21 Nov 2010 11:11:21 +0000 (21 12:11 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Nov 2010 00:23:10 +0000 (23 16:23 -0800) | ||
| tree | 583b1ecb0f83d5e0c10dbc2bfec4cabcf472cb7c | treesnapshot (tar.gz zip) |
| parent | 1c7d402b3e1e9d7e50abfbfb18c88bc79be468ea | commitdiff |
rebase --abort: do not update branch ref
If a non-interactive rebase of a ref fails at commit X and is aborted by
the user, the ref will be updated twice. First to point at X (with the
reflog message "rebase finished: $head_name onto $onto"), and then back
to $orig_head. It should not be updated at all.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If a non-interactive rebase of a ref fails at commit X and is aborted by
the user, the ref will be updated twice. First to point at X (with the
reflog message "rebase finished: $head_name onto $onto"), and then back
to $orig_head. It should not be updated at all.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase.sh | diffblobblamehistory | |
| t/t3407-rebase-abort.sh | diffblobblamehistory |