| commit | 9aefd353804b744e05f253fb196029be620b26c0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 18 Nov 2018 09:23:55 +0000 (18 18:23 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 18 Nov 2018 09:23:55 +0000 (18 18:23 +0900) | ||
| tree | a3fc63fb2803a3177958643e11b105ff3a22dcf4 | treesnapshot (tar.gz zip) |
| parent | a5170794372cf1325710a3419473c91ec4af53bf | commitdiff |
| parent | 176f5d965ba128f79a51d6c8d1620506672403e1 | commitdiff |
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
"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 | diff1 | diff2 | blobhistory |
| t/t3420-rebase-autostash.sh | diff1 | diff2 | blobhistory |