From: Linus Torvalds <torvalds@linux-foundation.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: David Lang <david.lang@digitalinsight.com>, git@vger.kernel.org
Subject: Re: merge strategy request
Date: Sat, 24 Mar 2007 21:31:45 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.64.0703242130050.6730@woody.linux-foundation.org> (raw)
In-Reply-To: <Pine.LNX.4.63.0703250315461.4045@wbgn013.biozentrum.uni-wuerzburg.de>
On Sun, 25 Mar 2007, Johannes Schindelin wrote:
>
> Basically, just write a program named "git-merge-david-lang", which takes
> arguments of the form
>
> merge-base [merge-base2...] -- head remote [remote...]
I think you are missing what David wants.
David does *not* want a new global strategy. Adding those is fairly easy.
David seem sto want a new per-file merge strategy, with the bog-standard
recursive merge. We've talked about that possibility in the past, but we
don't do it now. We always end up doing just the three-way merge.
Linus
next prev parent reply other threads:[~2007-03-25 4:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-24 22:46 merge strategy request David Lang
2007-03-25 1:20 ` Johannes Schindelin
2007-03-25 1:18 ` David Lang
2007-03-25 4:31 ` Linus Torvalds [this message]
2007-03-25 6:25 ` David Lang
2007-03-25 7:17 ` Junio C Hamano
2007-03-25 23:34 ` Martin Langhoff
2007-03-25 23:16 ` David Lang
2007-03-25 23:44 ` Junio C Hamano
2007-03-26 0:11 ` Martin Langhoff
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=Pine.LNX.4.64.0703242130050.6730@woody.linux-foundation.org \
--to=torvalds@linux-foundation.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=david.lang@digitalinsight.com \
--cc=git@vger.kernel.org \
/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).