diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-11-07 06:00:50 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-08 10:16:38 +0900 |
| commit | 176f5d965ba128f79a51d6c8d1620506672403e1 (patch) | |
| tree | 90c11373fb4e7bd39f062040119f7e43fb993aa2 /t/t6060-merge-index.sh | |
| parent | built-in rebase: demonstrate regression with --autostash (diff) | |
| download | tgif-176f5d965ba128f79a51d6c8d1620506672403e1.tar.xz | |
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>
Diffstat (limited to 't/t6060-merge-index.sh')
0 files changed, 0 insertions, 0 deletions