From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Nov 2023 13:03:38 GMT
Subject: Re: [RFC PATCH 2/2] rev-list: add --ours/--theirs options
Message-ID: <xmqqo7fvw4lx.fsf@gitster.g>
In-Reply-To: <20231115120417.1327259-2-vegard.nossum@oracle.com>

Vegard Nossum <vegard.nossum@oracle.com> writes:

> Add --ours and --theirs to view the commits from
>
>   $(git merge-base HEAD MERGE_HEAD)..HEAD and
>   $(git merge-base HEAD MERGE_HEAD)..MERGE_HEAD

The range you wrote with "merge-base" would not work well, when
there are multiple merge bases between HEAD and MERGE_HEAD.  

Just saying

	MERGE_HEAD..HEAD and
	HEAD..MERGE_HEAD

or even simpler, saying

	MERGE_HEAD.. and
	..MERGE_HEAD

would be sufficient, simpler, and more importantly, more correct.