Merge branch 'pw/replay-drop-empty' into jch

"git replay" is taught to drop commits that become empty (not the
ones that are empty in the original).

* pw/replay-drop-empty:
  replay: drop commits that become empty
  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

diff --cc Documentation/git-replay.adoc
index 4c61f3aa1f1c707eecf77bc91a216d3d3f021eda,96a3a557bf3338b4293245f074f0d1e5f58732d6..dc966486ca6e7d93effef84a94beb5e3319ff88d
--- 1/Documentation/git-replay.adoc
--- 2/Documentation/git-replay.adoc
+++ b/Documentation/git-replay.adoc
@@@ -59,10 -55,13 +59,12 @@@ which uses the target only as a startin
  The default mode can be configured via the `replay.refAction` configuration variable.
  
  <revision-range>::
 -      Range of commits to replay. More than one <revision-range> can
 -      be passed, but in `--advance <branch>` mode, they should have
 -      a single tip, so that it's clear where <branch> should point
 -      to. See "Specifying Ranges" in linkgit:git-rev-parse[1] and the
 -      "Commit Limiting" options below. Any commits in the range whose
 +      Range of commits to replay; see "Specifying Ranges" in
 +      linkgit:git-rev-parse[1]. In `--advance <branch>` mode, the
 +      range should have a single tip, so that it's clear to which tip the
-       advanced <branch> should point.
++      advanced <branch> should point. Any commits in the range whose
+       changes are already present in the branch the commits are being
+       replayed onto will be dropped.
  
  include::rev-list-options.adoc[]
  

diff --cc Makefile
Simple merge

diff --cc builtin/replay.c
Simple merge

diff --cc cache-tree.c
Simple merge

diff --cc commit.h
Simple merge

diff --cc meson.build
Simple merge

diff --cc t/meson.build
Simple merge