summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorLibravatar Ramkumar Ramachandra <artagnon@gmail.com>2013-06-16 14:15:11 +0530
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-17 09:56:57 -0700
commit89f2fea49a246e9ac4fa94cb43a7e992a8a4a144 (patch)
tree2b01185fd9a1c7618bde58504fd1319b922afc16 /resolve-undo.h
parentwt-status: remove unused field in grab_1st_switch_cbdata (diff)
downloadtgif-89f2fea49a246e9ac4fa94cb43a7e992a8a4a144.tar.xz
t/t2021-checkout-last: "checkout -" should work after a rebase finishes
$ git checkout - does not work as expected after a rebase. This is because the reflog records "checkout" made by "rebase" as its implementation detail the same way as end-user initiated "checkout", and makes it count as the branch that was previously checked out. Add four failing tests documenting this bug: two for a normal rebase, and another two for an interactive rebase. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions