From: Jay Soffian <jaysoffian@gmail.com>
Date: Sun, 22 May 2011 20:12:53 GMT
Subject: combined diff does not detect binary files and ignores -diff attribute
Message-ID: <BANLkTi=FtkiUjwAa7e3KAC5FF3GNxWzd3Q@mail.gmail.com>

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.