From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 1 Dec 2018 12:41:42 +0000 (+0900)
Subject: Merge branch 'jc/format-patch-range-diff-fix'
X-Git-Tag: v2.20.0-rc2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d32fa3c6f7f441c7c9f16d0661ce041e6f9a3439;p=thirdparty%2Fgit.git

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
---

d32fa3c6f7f441c7c9f16d0661ce041e6f9a3439