From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Aug 2008 06:59:32 GMT
Subject: Re: [PATCH] filter-branch: use --simplify-merges
Message-ID: <7vsktara5n.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <200808120747.22228.trast@student.ethz.ch>

Thomas Rast <trast@student.ethz.ch> writes:

> Junio C Hamano wrote:
>>  ... 
>> Nevermind.  You based this on top of the "fix ancestor discovery" patch.
>>
>> I'll squash these two and queue them in 'pu' for now.
>
> Please don't.  I'm still convinced the "fix ancestor discovery" is a
> fix to current code that works independent of --simplify-merges.  If
> you squash them, it cannot go into a release before --simplify-merges
> even if I manage to convince Dscho of this.

Anything parked in 'pu' is a fair game for replacement later, so please
send a replacement series and tell me to drop the previous ones from 'pu'.