diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:04 -0700 |
| commit | a4b4f9b8e317844ef64ec073241d38c9a656b2c8 (patch) | |
| tree | 57cc5feab6b76b64687035c8b075527023a19e49 /git-mergetool--lib.sh | |
| parent | Merge branch 'ms/submodule-update-config-doc' into maint (diff) | |
| parent | diff --shortstat --dirstat: remove duplicate output (diff) | |
| download | tgif-a4b4f9b8e317844ef64ec073241d38c9a656b2c8.tar.xz | |
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
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions