From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Dec 2024 17:32:17 +0000 (-0800)
Subject: Merge branch 'js/range-diff-diff-merges'
X-Git-Tag: v2.48.0-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88e59f8027ed0260584ccc0abd6fe435031614eb;p=thirdparty%2Fgit.git

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
---

88e59f8027ed0260584ccc0abd6fe435031614eb