My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30a52c1 ab27389)
Merge branch 'mk/diff-shortstat-dirstat-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 14 Mar 2015 05:56:04 +0000 (22:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 14 Mar 2015 05:56:04 +0000 (22:56 -0700)
"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

1  2 
diff.c patch | diff1 | diff2 | blob | history

diff --cc diff.c
Simple merge
The core git plumbing