]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c4cc685 4538338)
Merge branch 'js/range-diff-diff-merges'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Dec 2024 17:32:17 +0000 (09:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Dec 2024 17:32:17 +0000 (09:32 -0800)
commit88e59f8027ed0260584ccc0abd6fe435031614eb
treea416556f6e4279cb7c80ebbb68de1f3b01feecb9tree
parentc4cc685a62ffc06c86b1ecd1382c1b5cd0166189commit | diff
parent4538338c7edb13a5e818abcfa5739f16ad3dda0ccommit | 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
builtin/range-diff.c diff1 | diff2 | blob | history
range-diff.c diff1 | diff2 | blob | history
t/t3206-range-diff.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.