Merge branch 'nd/diff-stat-with-summary'
commit868f7d23384931641aa4901aab27f3f23577e63b
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Mar 2018 19:01:02 +0000 (14 12:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Mar 2018 19:01:02 +0000 (14 12:01 -0700)
tree148d5d0a8e4e71487fe598c9196b397c40c934f1
parentd0db9edba0050ada6f6eac68061599690d2a4333
parentddf88fa6166473be15822739e0a12aad4edfbbc5
Merge branch 'nd/diff-stat-with-summary'

"git diff" and friends learned "--compact-summary" that shows the
information usually given with the "--summary" option on the same
line as the diffstat output of the "--stat" option (which saves
vertical space and keeps info on a single path at the same place).

* nd/diff-stat-with-summary:
  diff: add --compact-summary
  diff.c: refactor pprint_rename() to use strbuf
Documentation/diff-options.txt
diff.c
diff.h