From: Junio C Hamano <gitster@pobox.com>
To: Vegard Nossum <vegard.nossum@oracle.com>
Cc: git@vger.kernel.org
Subject: Re: [RFC PATCH 2/2] rev-list: add --ours/--theirs options
Date: Wed, 15 Nov 2023 22:03:38 +0900 [thread overview]
Message-ID: <xmqqo7fvw4lx.fsf@gitster.g> (raw)
In-Reply-To: <20231115120417.1327259-2-vegard.nossum@oracle.com> (Vegard Nossum's message of "Wed, 15 Nov 2023 13:04:17 +0100")
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.
prev parent reply other threads:[~2023-11-15 13:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-15 12:04 [RFC PATCH 1/2] diff: add tests for git diff --merge/--ours/--theirs Vegard Nossum
2023-11-15 12:04 ` [RFC PATCH 2/2] rev-list: add --ours/--theirs options Vegard Nossum
2023-11-15 13:03 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqo7fvw4lx.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=vegard.nossum@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).