On Mon, May 23, 2011 at 9:30 AM, Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> wrote: > Jay Soffian venit, vidit, dixit 22.05.2011 22:12: >> In a merge commit, I added some PNGs (so they were new to both >> parents). I was surprised when I did a "git show" on the commit and >> had the binary bits spewed to the terminal. >> >> I thought it was just git not detecting the PNG as a binary file, but >> adding "*.png -diff" to .git/info/attributes made no difference. >> >> Just reporting this for now, as I don't have time to investigate. >> >> j. > > We know, but we somehow got stuck, see: > > http://permalink.gmane.org/gmane.comp.version-control.git/171613 > > I don't have the time to follow up on this currently, it got out of > proportion. Drat, seems like the perfect being the enemy of the good there. I wonder if Junio's patch in that thread isn't good enough for now. Thanks, j. -- 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