From: Stephan Beyer <s-beyer@gmx.net>
Date: Wed, 13 Aug 2008 20:05:27 GMT
Subject: Re: [PATCH (1b)] merge-recursive.c: Add more generic merge_recursive_generic()
Message-ID: <20080813200526.GA10758@leksak.fem-net>
In-Reply-To: <7v3al8ofjw.fsf@gitster.siamese.dyndns.org>

Hi,

Junio C Hamano wrote:
> The scripted version of revert/cherry-pick used git-merge-recursive
> because that is the Porcelain API available, and the current C-rewrite
> uses it as well, but if we are rewriting it to call merge-recursive
> machinery directly, it should be making a single merge request to
> merge_trees(), not "recursive" one.

This is an interesting point.
So perhaps we don't need stuff like my regarding merge_recursive_generic(),
at least not for revert/cherry-pick.

Regards,
  Stephan

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F