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.h | |
| parent | Merge branch 'js/mingw-rename-fix' (diff) | |
| parent | range-diff: introduce the convenience option `--remerge-diff` (diff) | |
| download | git-88e59f8027ed0260584ccc0abd6fe435031614eb.tar.gz git-88e59f8027ed0260584ccc0abd6fe435031614eb.zip | |
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.h')
0 files changed, 0 insertions, 0 deletions