Merge branch 'jk/diffstat-binary' into next
commit49da967d0b818f93e4bb950c04359cd24ba45340
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Feb 2011 22:23:06 +0000 (23 14:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Feb 2011 22:23:06 +0000 (23 14:23 -0800)
tree9dc862904946048ba996d9e70e0fa9e51ba0e26b
parenta4217f506695a8a1bd1900ee58612045c2f392a4
parentabb371a1ef5bddee904551afdec38854f95e99bb
Merge branch 'jk/diffstat-binary' into next

* jk/diffstat-binary:
  diff: don't retrieve binary blobs for diffstat
  diff: handle diffstat of rewritten binary files
diff.c