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 /commit.c | |
parent | c4cc685a62ffc06c86b1ecd1382c1b5cd0166189 (diff) | |
parent | 4538338c7edb13a5e818abcfa5739f16ad3dda0c (diff) |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions