From: Junio C Hamano <junkio@cox.net>
Date: Wed, 07 Feb 2007 21:05:27 GMT
Subject: Re: [PATCH for 'next'] fast-import: in_merge_bases() has a different signature now
Message-ID: <7vtzxx65m0.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.63.0702071235370.22628@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> The function in_merge_bases() can take more than one reference now,
> and therefore we need to call it differently.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>
> 	Yes, yes, I know. BAD Dscho. Still not using master. Maybe 
> 	tomorrow I will find the time to rebase my changes on top of
> 	next to master. That will be my first experience with git-rebase!

Thanks for a heads-up.

It _might_ be worth merging the in_merge_bases() from 'next' to
'master', either up to 03840fc3 or all the way to dc3806d3.

But I'd resist the temptation for now.