Merge branch 'nd/diff-stat-with-summary' into jch
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Feb 2018 21:04:42 +0000 (13:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Feb 2018 21:04:42 +0000 (13:04 -0800)
commite1f7302e44128df4cbf361af286ac0379b2b8711
tree86604b6b8961327e8e3928297c1ceb118dcc71cc
parent7b33418e31b7846c7a2f5b4ef40da05651179372
parentcc1775942e249daee4675a040709c047ee8a8fc1
Merge branch 'nd/diff-stat-with-summary' into jch

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