Andrew's git / gitweb.git / diff
?
Merge branch 'js/rebase-autostash-detach-fix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:55 +0000 (18:23 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:55 +0000 (18:23 +0900)
"git rebase --autostash" did not correctly re-attach the HEAD at times.

* js/rebase-autostash-detach-fix:
built-in rebase --autostash: leave the current branch alone if possible
built-in rebase: demonstrate regression with --autostash

1  2 
builtin/rebase.c patch | diff1 | diff2 | blob | history
t/t3420-rebase-autostash.sh patch | diff1 | diff2 | blob | history
diff --cc builtin/rebase.c
Simple merge
diff --cc t/t3420-rebase-autostash.sh
Simple merge