From: Junio C Hamano Date: Tue, 27 Jun 2006 17:05:37 GMT Subject: Re: CFT: merge-recursive in C Message-ID: <7vac7ya5r2.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Johannes Schindelin writes: >> > - I always wondered why merge-recursive did not call merge-base, but did >> > its own thing. Hmm? >> >> No idea yet. A somewhat related issue is that when one head is given I'd strongly prefer that merge-recursive did not call merge-base nor did its own thing (that is, for the top-level). Otherwise we cannot use it for historyless three tree merge that we need for rebase/revert/cherry-pick.