With a msysgit 1.6.4 package, I got stuck after someone copied a CRLF file
to a Linux box and committed it.
In that situation, the win32 client in autocrlf mode keeps telling that
the files are locally modified, even after eg "git reset --hard". Without
touching the crlf setting (which I believe should not ever be necessary),
this can be corrected by committing the faulty files after dos2unix'ing
them, and using "git fetch && git reset --hard origin/master" ("git pull
--rebase" refuses to do the job since it believes there are local
changes).
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html