From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 May 2026 01:30:57 +0000 (+0900)
Subject: Merge branch 'ps/history-fixup'
X-Git-Tag: v2.55.0-rc0~80
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=ca7d7d642406e608214ee4529a75a6ad2310de35;p=thirdparty%2Fgit.git

Merge branch 'ps/history-fixup'

"git history" learned "fixup" command.

* ps/history-fixup:
  builtin/history: introduce "fixup" subcommand
  builtin/history: generalize function to commit trees
  replay: allow callers to control what happens with empty commits
---

ca7d7d642406e608214ee4529a75a6ad2310de35