git help attributes sayeth: eol This attribute sets a specific line-ending style to be used in the working directory. It enables end-of-line normalization without any content checks, effectively setting the text attribute. But does text=auto override that? While we're here, it would also be nice to clarify platform-specific eol defaults, etc. Context: http://colabti.org/irclogger/irclogger_log/git?date=2014-07-18#l4289 and surrounding conversation