I don't mind forcing LF as line end, but I think that there is a silver bullet solution. We need to ask the core devs for help. Some reading  from the first answer:
"However, there's a better alternative: Benefit from LF line endings in your Linux workdir, CRLF line endings in your Windows workdir AND LF line endings in your repository.
As you're partially working on Linux and Windows, make sure core.eol is set to native and core.autocrlf is set to true.
Then, replace the content of your .gitattributes file with the following
This will let Git handle the automagic line endings conversion for you, on commits and checkouts. Binary files won't be altered, files detected as being text files will see the line endings converted on the fly."
I'll be testing it in on my repo:
Code: Select all
[przemo@localhost freecad]$ git config --global core.eol true
[przemo@localhost freecad]$ git config --global core.eol native
and "* text=auto" in .gitattributes
 http://stackoverflow.com/questions/9976 ... rking-copy