Merge branch 'as/diff-shortstat-ignore-binary'
commit0b6e913c8be236ba801b49d21490409f13af7cd9
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Jun 2012 22:00:53 +0000 (15 15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Jun 2012 22:00:53 +0000 (15 15:00 -0700)
treeafae79287a2430befe80ce32d44768afa94bd76c
parent1fd8f97f6e2c5f928e7399adb59b6d87ac82eb08
parentde9658b511377e9eaa2c58a8c3885a1a01b94be8
Merge branch 'as/diff-shortstat-ignore-binary'

# By Alexander Strasser
* as/diff-shortstat-ignore-binary:
  diff: Only count lines in show_shortstats
diff.c
t/t4012-diff-binary.sh