From: Junio C Hamano Date: Wed, 11 Mar 2015 17:59:58 GMT Subject: Re: Surprising interaction of "binary" and "eol" gitattributes Message-ID: In-Reply-To: <54FFD89A.9050306@web.de> Torsten Bögershausen writes: > On 03/10/2015 11:54 PM, Junio C Hamano wrote: >> Michael Haggerty writes: >> >>> Well, that's true, but the "eol" attribute can regain its effect if >>> "binary" is followed by "text" or "text=auto". So I guess the simplest >>> question is as follows. Suppose I have the following .gitattributes: >>> >>> a.foo eol=crlf >>> a.foo binary >>> a.foo text >>> >> As binary is not just -text and turns other things off, those other >> things will be off after these three. > Not sure if I follow: > Whenever you specify -text, the eol doesn't matter, or what do I miss ? Something unrelated to the main theme of this topic ;-). I was just saying that saying "a.foo text" is not a way to take your earlier mistake of saying "a.foo binary" back, if that "binary" was placed on the path by mistake or an over-eager globbing. The 'text' attribute will be reset, but -diff you placed on the path by saying "binary" is still there after these three attribute lines and running "git diff a.foo" would sill show the effect from it.