From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Dec 2019 20:52:44 +0000 (-0800)
Subject: Merge branch 'dl/range-diff-with-notes'
X-Git-Tag: v2.25.0-rc0~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3c7bfdde23f65f5ac8577afacffeb083fc8497f;p=thirdparty%2Fgit.git

Merge branch 'dl/range-diff-with-notes'

"git range-diff" learned to take the "--notes=<ref>" and the
"--no-notes" options to control the commit notes included in the
log message that gets compared.

* dl/range-diff-with-notes:
  format-patch: pass notes configuration to range-diff
  range-diff: pass through --notes to `git log`
  range-diff: output `## Notes ##` header
  t3206: range-diff compares logs with commit notes
  t3206: s/expected/expect/
  t3206: disable parameter substitution in heredoc
  t3206: remove spaces after redirect operators
  pretty-options.txt: --notes accepts a ref instead of treeish
  rev-list-options.txt: remove reference to --show-notes
  argv-array: add space after `while`
---

f3c7bfdde23f65f5ac8577afacffeb083fc8497f