Re: [PATCH v4] log: improve --follow following renames for non-linear history

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 22, 2026, 12:44 UTC
Message-ID: <xmqq1pdy4udg.fsf@gitster.g>
In-Reply-To: <ajjU4w2B0NlZffw1@collabora.com>

Miklos Vajna <vmiklos@collabora.com> writes:

Show 6 quoted lines

> I noticed that merging 'mv/log-follow-mergy' to 'master' results in a
> (simple) conflict since commit 42d960748e (line-log: integrate -L output
> with the standard log-tree pipeline, 2026-05-28), this is an updated
> version that resolves the conflict.
> ...
> Please replace the content of that branch with this patch.

If there are changes of substance, polishing with new iterations is welcome even without any code change (e.g., clarifying the proposed log message or documentation to help future readers understand what went on in this patch would count), but as long as the resolution that is in my tree (as a part of 'seen') exactly matches what your update contains (meaning: rerere will do the same correct resolution when the topic gets merged to 'master' anyway) and the conflict is trivial to resolve by hand for others, which seems to be the case here,

    $ git checkout --detach master
    $ git -c rerere.autoupdate merge mv/log-follow-mergy
    $ git commit --no-edit
    $ HERE=$(git rev-parse HEAD)
    $ git reset --hard HEAD^ ;# back at 'master'
    $ git am $this_message
    $ git diff $HERE ;# shows nothing
    $ git range-diff master..$HERE master..HEAD ;# no change in the log message

I'd prefer not to see such a reroll.

Thanks.