tree afae79287a2430befe80ce32d44768afa94bd76c
parent 1fd8f97f6e2c5f928e7399adb59b6d87ac82eb08
parent de9658b511377e9eaa2c58a8c3885a1a01b94be8
author Junio C Hamano <gitster@pobox.com> 1339797653 -0700
committer Junio C Hamano <gitster@pobox.com> 1339797653 -0700

Merge branch 'as/diff-shortstat-ignore-binary'

# By Alexander Strasser
* as/diff-shortstat-ignore-binary:
  diff: Only count lines in show_shortstats