From: Junio C Hamano Date: Fri, 6 Mar 2015 23:02:28 +0000 (-0800) Subject: Merge branch 'mk/diff-shortstat-dirstat-fix' X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=b6488fe191c3bff0dee39cfd2a7082dd52159c47;p=git.git Merge branch 'mk/diff-shortstat-dirstat-fix' "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 --- b6488fe191c3bff0dee39cfd2a7082dd52159c47