On Wed, Oct 25, 2017 at 10:13:57AM -0700, Jonathan Nieder wrote: > Hi again, > > Lars Schneider wrote: > >> On 24 Oct 2017, at 20:14, Jonathan Nieder <jrnie...@gmail.com> wrote: > > >> In any event, you also probably want to declare what you're doing > >> using .gitattributes. By checking in the files as CRLF, you are > >> declaring that you do *not* want Git to treat them as text files > >> (i.e., you do not want Git to change the line endings), so something > >> as simple as > >> > >> * -text > > > > That's sounds good. Does "-text" have any other implications? > > For whatever reason I always thought this is the way to tell > > Git that a particular file is binary with the implication that > > Git should not attempt to diff it. > > No other implications. You're thinking of "-diff". There is also a > shortcut "binary" which simply means "-text -diff".
Not 100% the same, as far as I know. "binary" means: Don't convert line endings, and there is now way to do a readable diff. The only thing to tell the user is: The binary blobs are different. Then we have "text". The "old" version of "text" was "crlf", which for some people was more intuitive, and less intuitive for others. "* crlf" is the same as "* text" and means please convert line endings. And yes, the file is still line oriented. "* -crlf" means don't touch the line endings, the file is line-orinted and diff and merge will work. "* -text" is the same as "* -crlf" > > Ideas for wording improvements to gitattributes(5) on this subject? None from me at the moment. > > Thanks, > Jonathan
