From: Elijah Newren <newren@gmail.com>
Date: Tue, 10 Aug 2021 17:03:38 GMT
Subject: Re: [PATCH 0/3] rebase --continue: remove .git/MERGE_MSG
Message-ID: <CABPp-BHh5nEjhDFewCwJgNtTCPpODN7dAAKGHYz91PyFwT4rdg@mail.gmail.com>
In-Reply-To: <pull.1013.git.1628587917.gitgitgadget@gmail.com>

On Tue, Aug 10, 2021 at 2:32 AM Phillip Wood via GitGitGadget
<gitgitgadget@gmail.com> 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.