Update 2008-04-24: as commenter Jakub Narebski correctly points out, it should be better to use core.autocrlf and crlf attribute for resolving this issue, but I have had no chance to test this up to now. The solution below is still valid, but more of the sort of an ugly hack. Update 2008-06-11: I have stopped using this solution and only use “git-config core.autocrlf true” and “git-config core.saf