| commit | 176f5d965ba128f79a51d6c8d1620506672403e1 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Wed, 7 Nov 2018 14:00:50 +0000 (7 06:00 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 8 Nov 2018 01:16:38 +0000 (8 10:16 +0900) | ||
| tree | 90c11373fb4e7bd39f062040119f7e43fb993aa2 | treesnapshot (tar.gz zip) |
| parent | 2dac2bc843198c378b1f14dc9b7d3994cb240c97 | commitdiff |
built-in rebase --autostash: leave the current branch alone if possible
When we converted a `git reset --hard` call in the original Unix shell
script to built-in code, we asked to reset the worktree and the index
and explicitly *not* to detach the HEAD. By mistake, though, we still
did. Let's fix this.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When we converted a `git reset --hard` call in the original Unix shell
script to built-in code, we asked to reset the worktree and the index
and explicitly *not* to detach the HEAD. By mistake, though, we still
did. Let's fix this.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/rebase.c | diffblobblamehistory | |
| t/t3420-rebase-autostash.sh | diffblobblamehistory |