Had the same issue as #1 - by telling git to always keep the LF line-endings people will not run into this issue anymore
Ceriath