From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Jan 2026 19:02:40 GMT
Subject: Re: [PATCH v11 0/8] Introduce git-history(1) command for easy history editing
Message-ID: <xmqq4ioeu6un.fsf@gitster.g>
In-Reply-To: <aWpoMcgwsfRCCrr4@szeder.dev>

SZEDER Gábor <szeder.dev@gmail.com> writes:

> On Fri, Jan 16, 2026 at 07:21:21AM -0800, Junio C Hamano wrote:
>> Elijah Newren <newren@gmail.com> writes:
>> 
>> > On Tue, Jan 13, 2026 at 1:54 AM Patrick Steinhardt <ps@pks.im> wrote:
>> > [...]
>> >> Changes in v11:
>> >>   - Fix overly clever `BUG()` condition.
>> >>   - Drop the `struct replay_result::merge_conflict` field.
>> >>   - Return a positive value from `replay_revisions()` in case there was
>> >>     a conflict.
>> >>   - Improve a commit message.
>> >>   - Fix check for whether `setup_revisions_from_strvec()` was
>> >>     successful.
>> >>   - Link to v10: https://lore.kernel.org/r/20260112-b4-pks-history-builtin-v10-0-e3c6aa5b4cec@pks.im
>> >
>> > This version looks good to merge down.
>> 
>> Thanks.
>
> FWIW, I think it's far from ready to be merged.

Will the discussion continue in the other subthread, i.e.,

https://lore.kernel.org/git/CABPp-BHkNLdH4C7U4sFoVhrsSPH8KAaDtOdLEQGyajmXZz9hVg@mail.gmail.com/