Re: [RFC PATCH] `log --merge` also for rebase/cherry pick/revert

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 12, 2024, 20:18 UTC
Message-ID: <xmqqv87y9ufq.fsf@gitster.g>
In-Reply-To: <ce46229d-8964-4445-9a17-cff40aca1cb4@kdbg.org>

Johannes Sixt <j6t@kdbg.org> writes:

Show 8 quoted lines

>> What do you think about this idea? (Or am I maybe missing an easy way to
>> achieve it with the existing code as well?)
>
> Ha! Very nice patch. For comparison, have a look at my patch to achieve
> the same that I never submitted (in particular, the author date):
> https://github.com/j6t/git/commit/2327526213bc2fc3c109c1d8b4b0d95032346ff0
>
> This implementation is more complete than mine. I like it.

I like the way your other_merge_candidate() loops over an array of possible candidates, which makes it a lot easier to extend, though, admittedly the "die()" message needs auto-generating if we really wanted to make it maintenance free ;-)

Thanks.