Re: [PATCH v2 0/3] commit: refuse to amend during conflict resolution

From: Elijah Newren <newren@gmail.com>
Date: Aug 27, 2026, 16:28 UTC
Message-ID: <CABPp-BG3O1xB3AhU3NfAwT5S1W5UnikT8U9HW=AqA9inYMS76w@mail.gmail.com>
In-Reply-To: <6a04525c-d9e7-415a-845f-f11ed1c0f0d5@gmail.com>

Hi Phillip,

On Thu, Aug 27, 2026 at 8:19 AM Phillip Wood <phillip.wood123@gmail.com> wrote:

Show 10 quoted lines

>
> > The three patches:
> >
> >   1. reword the two pre-existing "empty commit" rebase messages, which were
> >      misleadingly generic
> >   2. refuse git commit --amend during these additional operations
> >   3. refuse partial commits during the same operations.
>
> Thanks for working on this, it is a useful improvement to our UI. I've
> left a couple of comments but this all looks pretty sound to me.

Thanks again for taking a look.  I'll send a v3 incorporating your suggestions.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.