From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Dec 2024 16:45:14 +0000 (-0800)
Subject: Merge branch 'js/log-remerge-keep-ancestry' into js/range-diff-diff-merges
X-Git-Tag: v2.48.0-rc1~15^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb8374c652e56ee18702a8d0b06dd6bf6d07eff7;p=thirdparty%2Fgit.git

Merge branch 'js/log-remerge-keep-ancestry' into js/range-diff-diff-merges

* js/log-remerge-keep-ancestry:
  log: --remerge-diff needs to keep around commit parents
---

eb8374c652e56ee18702a8d0b06dd6bf6d07eff7