From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Jun 2012 22:00:53 +0000 (-0700)
Subject: Merge branch 'as/diff-shortstat-ignore-binary'
X-Git-Tag: v1.7.11~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0b6e913c8be236ba801b49d21490409f13af7cd9;p=git.git

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

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

0b6e913c8be236ba801b49d21490409f13af7cd9