summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>2010-11-21 12:11:21 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-23 16:23:10 -0800
commit729ec9e23a13a0610a19a24901d0ab5e2bc44a12 (patch)
tree583b1ecb0f83d5e0c10dbc2bfec4cabcf472cb7c /merge-file.c
parentclean: remove redundant variable baselen (diff)
downloadtgif-729ec9e23a13a0610a19a24901d0ab5e2bc44a12.tar.xz
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>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions