| commit | a4b4f9b8e317844ef64ec073241d38c9a656b2c8 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 14 Mar 2015 05:56:04 +0000 (13 22:56 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 14 Mar 2015 05:56:04 +0000 (13 22:56 -0700) | ||
| tree | 57cc5feab6b76b64687035c8b075527023a19e49 | treesnapshot (tar.gz zip) |
| parent | 30a52c1dcbb286214a0d59fb4b3df1d13d9d060d | commitdiff |
| parent | ab27389affc78a521fe44fc25518e1d11a4fc433 | commitdiff |
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
"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
| diff.c | diff1 | diff2 | blobhistory |