Merge branch 'js/rebase-autostash-detach-fix'
commit9aefd353804b744e05f253fb196029be620b26c0
authorJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:55 +0000 (18 18:23 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:55 +0000 (18 18:23 +0900)
treea3fc63fb2803a3177958643e11b105ff3a22dcf4
parenta5170794372cf1325710a3419473c91ec4af53bf
parent176f5d965ba128f79a51d6c8d1620506672403e1
Merge branch 'js/rebase-autostash-detach-fix'

"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
builtin/rebase.c
t/t3420-rebase-autostash.sh