From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Sep 2025 17:19:44 GMT
Subject: Re: What's cooking in git.git (Sep 2025, #06; Mon, 15)
Message-ID: <xmqqv7limi1b.fsf@gitster.g>
In-Reply-To: <20250916164912.GA15474@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

> That said, it is not really that big an issue and I am fine with any
> fix. If you want to document how the history unfolded, then I think an
> evil merge shows that (neither topic had a problem on its own, but when
> merged we needed to adjust the result). And it is probably the least
> amount of work. ;)

That's also fine, too.  Let me try that ;-)