From: Daniel Barkalow <barkalow@iabervon.org>
Date: Thu, 08 Sep 2005 22:10:53 GMT
Subject: Re: Multi-ancestor read-tree notes
Message-ID: <Pine.LNX.4.63.0509081805280.23242@iabervon.org>
In-Reply-To: <7vy867te3f.fsf@assigned-by-dhcp.cox.net>

On Thu, 8 Sep 2005, Junio C Hamano wrote:

> Daniel Barkalow <barkalow@iabervon.org> writes:
> 
> > I assume that what you want is something to include everything from two 
> > commits, which would give conflicts if a name is reused?
> 
> My understanding is that Darrin wants to do what Linus did when
> he merged gitk into git.git.
> 
> Personally I think that is a specialized application and
> something like the git-merge-projects script I posted as a
> follow-up would be more appropriate than adding it to the
> current merge discussion.

Well, it's an easy addition to read-tree; just need a merge function which 
takes two entries and adds the non-NULL one in stage 0, or adds both if 
they both exist. git-merge-script probably shouldn't be the entry point to 
it, of course, but that part isn't my area anyway.

	-Daniel
*This .sig left intentionally blank*