From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Jan 2026 07:41:18 +0000 (+0900)
Subject: Merge branch 'ps/history' into seen
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e62a1bc8b3f3e2b8f2b9c9b030733f9d1cb5e831;p=thirdparty%2Fgit.git

Merge branch 'ps/history' into seen

"git history" history rewriting UI.

Comments?

* ps/history:
  builtin/history: implement "reword" subcommand
  builtin: add new "history" command
  wt-status: provide function to expose status for trees
  replay: yield the object ID of the final rewritten commit
  replay: small set of cleanups
  builtin/replay: move core logic into "libgit.a"
  builtin/replay: extract core logic to replay revisions
---

e62a1bc8b3f3e2b8f2b9c9b030733f9d1cb5e831
diff --cc t/meson.build
index 2aa2b02c90,c9f92450dc..541f7a6383
--- a/t/meson.build
+++ b/t/meson.build
@@@ -391,7 -387,8 +391,9 @@@ integration_tests = 
    't3436-rebase-more-options.sh',
    't3437-rebase-fixup-options.sh',
    't3438-rebase-broken-files.sh',
 +  't3440-rebase-trailer.sh',
+   't3450-history.sh',
+   't3451-history-reword.sh',
    't3500-cherry.sh',
    't3501-revert-cherry-pick.sh',
    't3502-cherry-pick-merge.sh',