From: Michael P. <mic...@gm...> - 2010-12-04 03:11:20
|
Segher Boessenkool wrote: >> >>> Yup, those files should be marked as binary -- we don't want to see >> >>> diffs >> >>> of big auto-generated XML-like files anyway. >> > >> > Well, the VC6 files are not XML. (*.dsp/dsw) >> >> I said XML-like, not XML -- aren't those files a big semi-hierarchical >> list of almost not manually edittable gobbledy-gook? Not at all, though the newer versions (*.sln/vcproj) are. They are vaguely similar to a makefile, though you certainly ought to be more careful editing them since they have to be parsed back in (unlike a makefile). And *I* certainly want to see diffs. >> >>> I still don't understand why in your configuration those are checked >> >>> out as CRLF, but other text files are just LF >> > >> > Oh, they are all CRLF in Windows; I just don't use those files in Windows, >> > so no issue. I do use them in Linux, but I have git configured >> > differently >> > there. I use gcc in Linux, and Microsoft in Windows, so I'm ok with those >> > files going whichever way you want (presumably LF, as I suggested). >> >> So for you, the issue is that those files go weird for git, even though you >> never touched them? Ho hum. No, those files are fine. The files that Pete marked CRLF in his gitattributes are the ones that actually "go weird". And I do need to touch them, though the problem arises even if I don't. Michael |