Re: CFT: merge-recursive in C

From: Linus Torvalds <torvalds@osdl.org>
Date: Jun 27, 2006, 00:07 UTC
Message-ID: <Pine.LNX.4.64.0606261704390.3927@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.64.0606261652350.3927@g5.osdl.org>

On Mon, 26 Jun 2006, Linus Torvalds wrote:

Show 5 quoted lines

> 
> git-diff-tree is one of the simplest git operations. We've got absolutely 
> _tons_ of infrastructure in place to do it efficiently, since it's done 
> all over the map (a "git-rev-list" with path limiting will do a diff-tree 
> against all the commits).

Side note - I think merge-recursive could/should be rewritten to use "git-merge-tree" instead of "git-read-tree -u -m". I suspect that the git-merge-tree output is in fact a lot closer to what git-merge-recursive actually wants to have.

			Linus