From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 19 Dec 2024 18:58:31 +0000 (-0800)
Subject: Merge branch 'js/log-remerge-keep-ancestry'
X-Git-Tag: v2.48.0-rc1~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb89eebf3bb0b78c5193f8b6293b4b22ce8b08ca;p=thirdparty%2Fgit.git

Merge branch 'js/log-remerge-keep-ancestry'

"git log -p --remerge-diff --reverse" was completely broken.

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

cb89eebf3bb0b78c5193f8b6293b4b22ce8b08ca