Re: [PATCH 2/7] [doc] git-merge: link to new merge conflicts guide

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 25, 2026, 21:49 UTC
Message-ID: <xmqqjyo9t30c.fsf@gitster.g>
In-Reply-To: <7EF35E41-8DB6-49B4-BFC6-6BE335047E60@gmail.com>

Ben Knoble <ben.knoble@gmail.com> writes:

Show 15 quoted lines

>> Le 25 sept. 2026 à 14:19, Junio C Hamano <gitster@pobox.com> a écrit :
>> 
>> "Julia Evans" <julia@jvns.ca> writes:
>> 
>>> Thanks, I meant to flag this: the reason I deleted it was really
>>> just that I couldn't understand what `git log --merge -p <path>`  did
>>> from the documentation and so I removed it until I could figure it out.
>> 
>> It looks at the index to figure out which paths we got conflicts on,
>> and then does "git log -p <those> <conflicted> <paths>".  You can
>> give a pathspec from the command line to further limit the output.
>
> This explanation omits the manual’s “HEAD…<other>” argument
> that the merge option implies, which is important for
> understanding the option and my alias ;)

Ahh, yes, you're right. HEAD...MERGE_HEAD is the more important half of what --merge gives us that I failed to mention.

And without the symmetric difference traversal it gives, --left-right would of course not work, either.