From: "Caleb Cushing" <xenoterracide@gmail.com>
To: "Nanako Shiraishi" <nanako3@lavabit.com>
Cc: "Leo Razoumov" <slonik.az@gmail.com>, git@vger.kernel.org
Subject: Re: more merge strategies : feature request
Date: Wed, 3 Dec 2008 17:59:56 -0500 [thread overview]
Message-ID: <81bfc67a0812031459g4c30908ew46e4cf2bd6445f64@mail.gmail.com> (raw)
In-Reply-To: <20081204062717.6117@nanako3.lavabit.com>
> Isn't what Caleb wants "-X ours/theirs" per-hunk option for merge strategy backends?
just from this description it sounds like it. I can't say anything
about that patch, but to me having such a strategy only makes sense.
--
Caleb Cushing
next prev parent reply other threads:[~2008-12-03 23:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-29 16:48 more merge strategies : feature request Caleb Cushing
2008-12-01 9:18 ` Andreas Ericsson
2008-12-02 2:38 ` Caleb Cushing
2008-12-02 3:30 ` Jeff King
2008-12-02 14:28 ` Caleb Cushing
2008-12-02 15:30 ` Jeff King
2008-12-02 2:49 ` Leo Razoumov
2008-12-02 13:46 ` Caleb Cushing
2008-12-03 1:07 ` Leo Razoumov
2008-12-03 21:27 ` Nanako Shiraishi
2008-12-03 22:59 ` Caleb Cushing [this message]
2008-12-04 2:15 ` Junio C Hamano
2008-12-04 10:11 ` Nanako Shiraishi
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=81bfc67a0812031459g4c30908ew46e4cf2bd6445f64@mail.gmail.com \
--to=xenoterracide@gmail.com \
--cc=git@vger.kernel.org \
--cc=nanako3@lavabit.com \
--cc=slonik.az@gmail.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).