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

From: Ben Knoble <ben.knoble@gmail.com>
Date: Sep 25, 2026, 19:32 UTC
Message-ID: <7EF35E41-8DB6-49B4-BFC6-6BE335047E60@gmail.com>
In-Reply-To: <xmqqld8purb8.fsf@gitster.g>

Show 11 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 ;)