tree 7337c0018c55bb91e000b78c8c2b8e973e71e070
parent 7068cbc4abac53d9c3675dfba81c1e97d25e8eeb
parent d8981c3f885ceaddfec0e545b0f995b96e5ec58f
author Junio C Hamano <gitster@pobox.com> 1543668102 +0900
committer Junio C Hamano <gitster@pobox.com> 1543668102 +0900

Merge branch 'jc/format-patch-range-diff-fix'

"git format-patch --range-diff" by mistake passed the diff options
used to generate the primary output of the command to the
range-diff machinery, which caused the range-diff in the cover
letter to include fairly useless "--stat" output.  This has been
corrected by forcing a non-customizable default formatting options
on the range-diff machinery when driven by format-patch.

* jc/format-patch-range-diff-fix:
  format-patch: do not let its diff-options affect --range-diff