From: Daniel Barkalow <barkalow@iabervon.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Add merge-subtree back
Date: Sun, 24 Feb 2008 01:19:55 -0500 (EST) [thread overview]
Message-ID: <alpine.LNX.1.00.0802240040010.19024@iabervon.org> (raw)
In-Reply-To: <7vprun32m2.fsf@gitster.siamese.dyndns.org>
On Sat, 23 Feb 2008, Junio C Hamano wrote:
> An earlier commit e1b3a2c (Build-in merge-recursive) made the
> subtree merge strategy backend unavailable. This resurrects
> it.
That's really quite subtle. I think there should probably be a
cmd_merge_subtree that shares almost everything with cmd_merge_recursive,
but is a different function.
Or maybe there should be a "--subtree" option to merge that has that
effect with arbitrary stratgeies by changing what gets sent to the
strategy.
But restoring access to the strategy for now is obviously fine.
-Daniel
*This .sig left intentionally blank*
next prev parent reply other threads:[~2008-02-24 6:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-23 19:16 [PATCH] Add merge-subtree back Junio C Hamano
2008-02-24 6:19 ` Daniel Barkalow [this message]
2008-02-28 1:51 ` [PATCH] New test to check the real "subtree" case Miklos Vajna
2008-02-28 9:45 ` Johannes Schindelin
2008-02-28 12:36 ` [PATCH] Improve t6029 " Miklos Vajna
2008-02-28 14:57 ` Johannes Schindelin
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=alpine.LNX.1.00.0802240040010.19024@iabervon.org \
--to=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).