Re: git pull (Your local changes to ... would be overwritten by merge)

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Matthieu Moy
Date: Thursday, June 17, 2010 - 8:21 am

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


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


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/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: git pull (Your local changes to ... would be overwritt ..., Matthieu Moy, (Thu Jun 17, 8:21 am)
Re: git pull (Your local changes to ... would be overwritt ..., Eyvind Bernhardsen, (Fri Jun 18, 12:44 am)