Merge branch 'ps/history' into seen

"git history" history rewriting UI.

Comments?

* ps/history:
  builtin/history: implement "split" subcommand
  cache-tree: allow writing in-memory index as tree
  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

diff --cc Documentation/meson.build
Simple merge

diff --cc Makefile
index 290f3133961cc5dfa40aff19c6a552396673c943,1380ee1e1961540ade5c0e7fdb78cb8db037c07d..c18b7fa3db3599a7bbc0d8387fe80deff61be316
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1267,13 -1260,8 +1267,14 @@@ LIB_OBJS += reftable/table.
  LIB_OBJS += reftable/tree.o
  LIB_OBJS += reftable/writer.o
  LIB_OBJS += remote.o
 +LIB_OBJS += repack.o
 +LIB_OBJS += repack-cruft.o
 +LIB_OBJS += repack-filtered.o
 +LIB_OBJS += repack-geometry.o
 +LIB_OBJS += repack-midx.o
 +LIB_OBJS += repack-promisor.o
  LIB_OBJS += replace-object.o
+ LIB_OBJS += replay.o
  LIB_OBJS += repo-settings.o
  LIB_OBJS += repository.o
  LIB_OBJS += rerere.o

diff --cc add-patch.c
index 173a53241ebf07b1cfde0988a4d3ac7330d22b6d,b8d46d54a2e06aa14fb7e1fd2e40dd932f5147fb..e689932448e2ed102218de5379fd629655ff013c
--- 1/add-patch.c
--- 2/add-patch.c
+++ b/add-patch.c
@@@ -1566,13 -1688,11 +1689,13 @@@ static int patch_update_file(struct add
                                                : 1));
                printf(_(s->mode->prompt_mode[prompt_mode_type]),
                       s->buf.buf);
-               if (*s->s.reset_color_interactive)
-                       fputs(s->s.reset_color_interactive, stdout);
+               if (*s->cfg.reset_color_interactive)
+                       fputs(s->cfg.reset_color_interactive, stdout);
                fflush(stdout);
 -              if (read_single_character(s) == EOF)
 +              if (read_single_character(s) == EOF) {
 +                      quit = 1;
                        break;
 +              }
  
                if (!s->answer.len)
                        continue;

diff --cc builtin/checkout.c
Simple merge

diff --cc meson.build
index e707f35df2c6cd449f8d5dbc00cbf409a1f34a27,2d789612a013befedd61e3402011447a4605d00f..b07d35609d57aa141c75e96dd4071c2f52fc8972
--- 1/meson.build
--- 2/meson.build
+++ b/meson.build
@@@ -463,13 -463,8 +463,14 @@@ libgit_sources = 
    'reftable/tree.c',
    'reftable/writer.c',
    'remote.c',
 +  'repack.c',
 +  'repack-cruft.c',
 +  'repack-filtered.c',
 +  'repack-geometry.c',
 +  'repack-midx.c',
 +  'repack-promisor.c',
    'replace-object.c',
+   'replay.c',
    'repo-settings.c',
    'repository.c',
    'rerere.c',

diff --cc t/meson.build
Simple merge

diff --cc wt-status.c
Simple merge