From: Stefan Beller <sbeller@google.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>, Jeff King <peff@peff.net>,
Junio C Hamano <junio@pobox.com>, demerphq <demerphq@gmail.com>
Subject: Re: [RFC WIP PATCH] merge: implement -s theirs -X N
Date: Wed, 18 Apr 2018 16:22:15 -0700 [thread overview]
Message-ID: <CAGZ79kak57D2_9bx5KwefFEZ0=Dk2bbZ=n8YFnByChK=6Hj2HQ@mail.gmail.com> (raw)
In-Reply-To: <87sh7sdtc1.fsf@evledraar.gmail.com>
On Wed, Apr 18, 2018 at 3:48 PM, Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
> We have a -s ours, but not a -s theirs. This is a WIP patch to implement
> that. It works, but I haven't dealt with this part of the internal API
> before, comments most welcome.
I hope reference pointers are welcome, too.
https://public-inbox.org/git/xmqqzi9iazrp.fsf@gitster.mtv.corp.google.com/
next prev parent reply other threads:[~2018-04-18 23:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-18 22:48 [RFC WIP PATCH] merge: implement -s theirs -X N Ævar Arnfjörð Bjarmason
2018-04-18 23:22 ` Stefan Beller [this message]
2018-04-19 4:29 ` Junio C Hamano
2018-04-19 4:46 ` Junio C Hamano
2018-04-19 8:28 ` Ævar Arnfjörð Bjarmason
2018-04-20 0:08 ` Junio C Hamano
2018-04-20 10:14 ` Ævar Arnfjörð Bjarmason
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAGZ79kak57D2_9bx5KwefFEZ0=Dk2bbZ=n8YFnByChK=6Hj2HQ@mail.gmail.com' \
--to=sbeller@google.com \
--cc=avarab@gmail.com \
--cc=demerphq@gmail.com \
--cc=git@vger.kernel.org \
--cc=junio@pobox.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).