]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'dl/range-diff-with-notes'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2019 20:52:44 +0000 (12:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2019 20:52:44 +0000 (12:52 -0800)
"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`

1  2 
Documentation/git-range-diff.txt
Documentation/rev-list-options.txt
range-diff.h

Simple merge
Simple merge
diff --cc range-diff.h
Simple merge