]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/history' into seen
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 Jan 2026 07:41:18 +0000 (16:41 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Jan 2026 07:41:18 +0000 (16:41 +0900)
"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

1  2 
Makefile
meson.build
t/meson.build

diff --cc Makefile
Simple merge
diff --cc meson.build
Simple merge
diff --cc t/meson.build
index 2aa2b02c90ce040e3a637f90bb3801ba26692b99,c9f92450dc53b52f8886a2185d89609b37cad2fe..541f7a638349948c0bd22c7373522069eabc9ad3
@@@ -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',