diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-12-23 09:32:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-12-23 09:32:17 -0800 |
| commit | 88e59f8027ed0260584ccc0abd6fe435031614eb (patch) | |
| tree | a416556f6e4279cb7c80ebbb68de1f3b01feecb9 /range-diff.h | |
| parent | c4cc685a62ffc06c86b1ecd1382c1b5cd0166189 (diff) | |
| parent | 4538338c7edb13a5e818abcfa5739f16ad3dda0c (diff) | |
| download | git-88e59f8027ed0260584ccc0abd6fe435031614eb.tar.xz | |
Merge branch 'js/range-diff-diff-merges'
"git range-diff" learned to optionally show and compare merge
commits in the ranges being compared, with the --diff-merges
option.
* js/range-diff-diff-merges:
range-diff: introduce the convenience option `--remerge-diff`
range-diff: optionally include merge commits' diffs in the analysis
Diffstat (limited to 'range-diff.h')
| -rw-r--r-- | range-diff.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/range-diff.h b/range-diff.h index 2f69f6a434..cd85000b5a 100644 --- a/range-diff.h +++ b/range-diff.h @@ -16,6 +16,7 @@ struct range_diff_options { int creation_factor; unsigned dual_color:1; unsigned left_only:1, right_only:1; + unsigned include_merges:1; const struct diff_options *diffopt; /* may be NULL */ const struct strvec *other_arg; /* may be NULL */ }; |