Thread (13 messages) flat view 13 messages, 3 authors, 2021-08-13

Re: [PATCH 0/3] rebase --continue: remove .git/MERGE_MSG

From: Elijah Newren <hidden>
Date: 2021-08-10 17:03:52

On Tue, Aug 10, 2021 at 2:32 AM Phillip Wood via GitGitGadget
[off-list ref] wrote:
If the user removes all the changes from the worktree without running git
reset then it rebase --continue leaves behind .git/MERGE_MSG which will then
s/then it/then/
seed the message of the next commit. While working on this I noticed a
couple of fixups for the test files I was adding to, I've cc'd Elijah in
case my reasoning for patch 2 is off. Thanks to Victor for the bug report.
I had a couple small comments on the first two patches.  Otherwise,
the whole series looks good to me.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help