From: Michael P. <mic...@gm...> - 2010-12-05 23:17:51
|
Pete Batard wrote: >> OK, since this discussion has been going long enough, let me try to >> propose a trade off there. >> >> As I don't have much of an issue with the MS project files, and it is >> expected that, even if we have conversion issues, they'll still be fine, >> I'm willing to revert my .gitattributes options on those to whatever >> suits you, as long as I can keep -crlf on .sh/.ac/.am (which is the only >> option that I deem safe enough). That's fine, and I appreciate it, but before you go to that effort, please try to explain this: >> $ git clone http://git.libusb.org/libusb-pbatard.git . >> $ git checkout -b prest pbr288 # pbr288 is the common ancestor >> $ git checkout -b pbst origin/supertest >> $ hexdump -C libusb.dsw |less >> [...shows LF-only...] >> $ git checkout master >> $ git checkout pbst >> $ hexdump -C libusb.dsw |less >> [...shows CRLF...] If it turns out that that isn't how things are supposed to behave, then we have a bigger issue. Michael |