Remote DOS Git repo and local unix repo

I am tracking remote repo which have files with dos endings (CRLF). I want to get local one which uses just LF, but I do not want to i开发者_开发技巧ntroduce changes in endings since I need to regularly merge with upstream repo. Any advises?

---

You should set:

core.autocrlf=true

See this page: http://help.github.com/line-endings/

---

Try core.autocrlf input. Also on each repo, you can set the native line ending so the autocrlf will do what you expect on each FS.