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`
This commit is contained in:
Junio C Hamano
2019-12-05 12:52:44 -08:00
10 changed files with 291 additions and 50 deletions

View File

@ -2,6 +2,7 @@
#define RANGE_DIFF_H
#include "diff.h"
#include "argv-array.h"
#define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60
@ -12,6 +13,7 @@
*/
int show_range_diff(const char *range1, const char *range2,
int creation_factor, int dual_color,
struct diff_options *diffopt);
struct diff_options *diffopt,
struct argv_array *other_arg);
#endif