]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/history' into pw/replay-drop-empty
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Dec 2025 01:24:38 +0000 (10:24 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Dec 2025 01:24:38 +0000 (10:24 +0900)
* ps/history:
  builtin/history: implement "split" subcommand
  cache-tree: allow writing in-memory index as tree
  add-patch: allow disabling editing of hunks
  add-patch: add support for in-memory index patching
  add-patch: remove dependency on "add-interactive" subsystem
  add-patch: split out `struct interactive_options`
  add-patch: split out header from "add-interactive.h"
  builtin/history: implement "reword" subcommand
  builtin: add new "history" command
  replay: stop using `the_repository`
  replay: extract logic to pick commits
  wt-status: provide function to expose status for trees
  replay: do not copy "gpgsign-sha256" header


Trivial merge