Here's something I hope nobody else has to go through: If you're using
msysgit to run git on a Windows machine, it defaults to to using CLRF line endings, rather than LF. Left to its own devices, git will "helpfully" convert LFs in files you download to CLRFs. The problem comes when you try to commit back to your *nix repository, and a bunch of files you didn't touch are marked as changed -- or worse, in conflict! Fortunately, there's an easy change. From the msysgit command line, do:
git config --global core.autoclrf false
The discussion I read this from said that's all I'd need to do, but when I did git config --list afterwards to browse my config file, I had two entries for core.autoclrf. One was set to "input" and the other to "false." I went to C:\Program Files\Git\etc, opened gitconfig, and erased the entry set to "input." That fixed it for future cases, but to get rid of all my existing conflicts I had to delete my project and re-clone it.
