From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 23 Jul 2008 14:14:56 GMT
Subject: Re: q: faster way to integrate/merge lots of topic branches?
Message-ID: <20080723141456.GA13556@elte.hu>
In-Reply-To: <20080723140959.GB9537@elte.hu>


* Ingo Molnar <mingo@elte.hu> wrote:

> Even assuming that the filesystem is sane, is my merge-cache 
> implementation semantically equivalent to a git-merge? One detail is 
> that i suspect it is not equivalent in the git-merge --no-ff case. 
> (but that is a not too interesting non-default case anyway)

actually, since --no-ff creates a merge commit and thus propagates the 
head sha1, this should work fine as well.

(besides the small detail that my script has $1 hardcoded so parameters 
are not properly passed onto.)

	Ingo