From: Daniel Barkalow <barkalow@iabervon.org>
Date: Sun, 24 Feb 2008 06:19:55 GMT
Subject: Re: [PATCH] Add merge-subtree back
Message-ID: <alpine.LNX.1.00.0802240040010.19024@iabervon.org>
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*