From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Thu, 17 Jun 2010 15:21:05 GMT
Subject: Re: git pull (Your local changes to ... would be overwritten by merge)
Message-ID: <vpqbpb9ofby.fsf@bauges.imag.fr>
In-Reply-To: <4C1A0DCD.2070906@drmicha.warpmail.net>

Michael J Gruber <git@drmicha.warpmail.net> writes:

> Daniel Blendea venit, vidit, dixit 17.06.2010 13:18:
>> Windows 7, did not change anything related to crlf.

I never used Git on Windows, but I think Git sets autocrlf to true by
default on Windows.

> I guess this shows that correct diagnostics is not a prerequisite for a
> successful therapy ;)
>
> (The diagnostics really indicate a work tree with local uncommitted
> modifications.)

I'd bet for this kind of issue:

http://kerneltrap.org/mailarchive/git/2010/3/9/25215/thread
From: Johannes Schindelin
Subject: core.autocrlf considered half-assed

Didn't follow the outcome in details, but some patches were proposed
to improve the situation.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/