diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2021-08-12 13:42:09 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-08-13 11:36:22 -0700 |
| commit | e5ee33e8551fa934862b8cbe50693f4841e7dace (patch) | |
| tree | 01f7e3e7b443c0605669166c83bc5409855349f8 /t/t7111-reset-table.sh | |
| parent | rebase --apply: restore some tests (diff) | |
| download | tgif-e5ee33e8551fa934862b8cbe50693f4841e7dace.tar.xz | |
rebase --continue: remove .git/MERGE_MSG
If the user skips the final commit by removing all the changes from
the index and worktree with 'git restore' (or read-tree) and then runs
'git rebase --continue' .git/MERGE_MSG is left behind. This will seed
the commit message the next time the user commits which is not what we
want to happen.
Reported-by: Victor Gambier <vgambier@excilys.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7111-reset-table.sh')
0 files changed, 0 insertions, 0 deletions