From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 14 Mar 2015 05:56:04 +0000 (-0700)
Subject: Merge branch 'mk/diff-shortstat-dirstat-fix' into maint
X-Git-Tag: v2.3.3~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4b4f9b8e317844ef64ec073241d38c9a656b2c8;p=thirdparty%2Fgit.git

Merge branch 'mk/diff-shortstat-dirstat-fix' into maint

"git diff --shortstat --dirstat=changes" showed a dirstat based on
lines that was never asked by the end user in addition to the
dirstat that the user asked for.

* mk/diff-shortstat-dirstat-fix:
  diff --shortstat --dirstat: remove duplicate output
---

a4b4f9b8e317844ef64ec073241d38c9a656b2c8