projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1c7d402) | patch
rebase --abort: do not update branch ref
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Sun, 21 Nov 2010 11:11:21 +0000 (12:11 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2010 00:23:10 +0000 (16:23 -0800)
commit729ec9e23a13a0610a19a24901d0ab5e2bc44a12
tree583b1ecb0f83d5e0c10dbc2bfec4cabcf472cb7ctree | snapshot
parent1c7d402b3e1e9d7e50abfbfb18c88bc79be468eacommit | diff
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>
git-rebase.sh diff | blob | history
t/t3407-rebase-abort.sh diff | blob | history
Git—the stupid content tracker