From: david.hagood@gmail.com Date: Tue, 01 Sep 2009 18:25:07 GMT Subject: Re: Problems with GIT under Windows - "not uptodate" Message-ID: In-Reply-To: <2729632a0909011119l3a19447ds9d4896a27ac488c1@mail.gmail.com> > It seems like you want core.autocrlf to be false or you want a > .gitattributes file to override it on a per-file basis for the files > you know are CRLF (i.e. the ones that are CRLF even on the Linux > side). That's what I've been leaning toward: a .gitattributes in that directory like this: *.xml -crlf diff merge Does that sound reasonable?