Re: [PATCH REGRESSION] builtin/rebase: allow user to amend committed conflicts again

From: Patrick Steinhardt <ps@pks.im>
Date: Sep 23, 2026, 18:38 UTC
Message-ID: <arQcwhuMtcZNoAmI@pks.im>
In-Reply-To: <xmqqzex7akcv.fsf@gitster.g>

On Wed, Sep 23, 2026 at 11:33:20AM -0700, Junio C Hamano wrote:

Show 10 quoted lines

> Patrick Steinhardt <ps@pks.im> writes:
> > It makes me wonder whether we can instead fix git-commit(1) itself to
> > maybe not reset authorship information. But that's probably a much
> > harder change to do, and probably it would make the mess that we have
> > with the ".git/rebase-merge" state directory even bigger.
> 
> I do not think I understand what you mean by "fix git-commit".  Make
> it pay attention to some file in .git/ directory and override the
> authorship information over what it usually uses, and make sure it
> removes that file after it consumed it, or something like that?

Yeah, exactly. The fact that it resets authorship information of a conflicting commit is probably quite surprising overall as an outcome. It's arguable whether this even qualifies as "fix", as in the end git-commit(1) simply does what it always does. But it probably doesn't match the expected outcome in many cases.

Patrick