diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-05 21:52:44 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-05 21:52:44 +0100 |
| commit | f3c7bfdde23f65f5ac8577afacffeb083fc8497f (patch) | |
| tree | 7f78aeb5960f987529c0ecd42b96cb1f453a9fa9 /range-diff.h | |
| parent | Merge branch 'jh/userdiff-python-async' (diff) | |
| parent | format-patch: pass notes configuration to range-diff (diff) | |
| download | git-f3c7bfdde23f65f5ac8577afacffeb083fc8497f.tar.xz git-f3c7bfdde23f65f5ac8577afacffeb083fc8497f.zip | |
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`
Diffstat (limited to 'range-diff.h')
| -rw-r--r-- | range-diff.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/range-diff.h b/range-diff.h index 77347a9f88..c57ec7dab5 100644 --- a/range-diff.h +++ b/range-diff.h @@ -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 |