Many problems happen with git due to some machines liking CRLF at the
end of lines, and others linking CR. To try to straighten this out,
I'm using Unix-style LF (\n) as the line endings. To make sure your
repository remains consistent, try:
$ git config --global core.autocrlf input
For details, see:
http://help.github.com/dealing-with-lineendings/