| commit | e5ee33e8551fa934862b8cbe50693f4841e7dace | |
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | |
| Thu, 12 Aug 2021 13:42:09 +0000 (12 13:42 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 Aug 2021 18:36:22 +0000 (13 11:36 -0700) | ||
| tree | 01f7e3e7b443c0605669166c83bc5409855349f8 | treesnapshot (tar.gz zip) |
| parent | bed9b4e3128af2c36645ba44fe19bf10af6d68ea | commitdiff |
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>
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>
| sequencer.c | diffblobblamehistory | |
| t/t3403-rebase-skip.sh | diffblobblamehistory | |
| t/t3418-rebase-continue.sh | diffblobblamehistory |