On Mon, Mar 08, 2010 at 12:29:01PM +0100, Johannes Schindelin wrote: > > Easiest example: > > $ git clone -n git://repo.or.cz/git.git html-docs > $ cd html-docs/ > $ git config core.autocrlf true > $ git checkout -t origin/html > $ git status As Junio explained in another mail, it was intentional to have all HTML files with CRLF, because they are supposed to have that ending on all platforms. What is missing, however, is .gitattributes, which would tell to Git that we do not want to autocrlf conversion for HTML files. This can be done by adding .gitattributes: $ cat >> .gitattributes <<EOF *.html -crlf EOF I've just noticed that user-manual.html differs from other HTML files in that it uses LF ending. I think it is a mistake, and this file should be converted to have CRLF, but if you want to have all HTML files except user-manual.html to have CRLF then you can do that too: $ cat > .gitattributes <<EOF *.html -crlf user-manual.html crlf EOF I hope Junio will add the right version of .gitattributes, so users with autocrlf=true will not suffer. Dmitry -- 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