On 2015-03-05 17.38, Michael Haggerty wrote: > I would expect that the following .gitattributes file > > * eol=crlf > *.png -text > > would leave EOL translation turned off for PNG files. In other words, I > would expect that explicitly setting "-text" would take precedence over > the fact that setting "eol" implies that a file should be considered to > be "text". > > I would even more strongly expect > > * eol=crlf > *.png binary > > to turn off EOL translation for PNG files. > > But in fact, in both of the above cases, EOL translation is turned *on* > for PNG files. > > I propose that "-text" should override any setting for "eol" (which > would of course fix both problems, since "binary" is equivalent to > "-diff -merge -text"). What do people think? > > Michael > ("binary" is not supported, we need "-text") Beside that, > * eol=crlf > *.png -text should work as you describe. Do you think you make a test case for this ? In best case as a real patch :-) (I know that attributes should take precedence over eol settings in the config file, and this is not always the case) -- 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