Merge branch 'pw/replay-drop-empty'

"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

diff --cc Documentation/git-replay.adoc
index c3b214ec6964c71c8f134cf69c7f0d69566a2c40,dc966486ca6e7d93effef84a94beb5e3319ff88d..8d696ce3abb4917da69fb1d9d396efaddc842e7a
--- 1/Documentation/git-replay.adoc
--- 2/Documentation/git-replay.adoc
+++ b/Documentation/git-replay.adoc
@@@ -62,9 -62,10 +62,11 @@@ The default mode can be configured via 
        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.
  
 +:git-replay: 1
  include::rev-list-options.adoc[]
  
  [[output]]