From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Jan 2009 08:26:39 GMT
Subject: Re: What's cooking in git.git (Jan 2009, #07; Wed, 28)
Message-ID: <7vbptqh60w.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20090129081438.GA10490@hashpling.org>

Charles Bailey <charles@hashpling.org> writes:

> On Wed, Jan 28, 2009 at 06:06:45PM -0800, Junio C Hamano wrote:
>> * cb/mergetool (Wed Jan 21 22:57:48 2009 +0000) 1 commit
>>  + mergetool: respect autocrlf by using checkout-index
>> 
>
> Can you hold off on merging this one? I now think that there's a
> cleaner way of doing this and I would like the opportunity for a
> rethink.

Sure, it is not in 'master' yet.

But it's in 'next', so incremental updates from now on, please.