Merge branch 'jk/diffstat-binary' into maint
commit4e530c5049a305f82c3e4768b26e6a689aa3c84e
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:26 +0000 (16 16:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Mar 2011 23:47:26 +0000 (16 16:47 -0700)
tree3705739dc7b4ba40e80d81715c65077d78ef75b3
parent13a39e2d865cbc8e1f6d6b71f54b7e4fdfd054a3
parentabb371a1ef5bddee904551afdec38854f95e99bb
Merge branch 'jk/diffstat-binary' into maint

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