summaryrefslogtreecommitdiffstats
path: root/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-12-23 18:32:17 +0100
committerJunio C Hamano <gitster@pobox.com>2024-12-23 18:32:17 +0100
commit88e59f8027ed0260584ccc0abd6fe435031614eb (patch)
treea416556f6e4279cb7c80ebbb68de1f3b01feecb9 /remote.c
parentMerge branch 'js/mingw-rename-fix' (diff)
parentrange-diff: introduce the convenience option `--remerge-diff` (diff)
downloadgit-88e59f8027ed0260584ccc0abd6fe435031614eb.tar.xz
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 'remote.c')
0 files changed, 0 insertions, 0 deletions