From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Feb 2026 20:09:09 +0000 (-0800)
Subject: Merge branch 'pw/replay-drop-empty'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8087aae54061d056b61da736664cea84eff3dee4;p=thirdparty%2Fgit.git

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
---

8087aae54061d056b61da736664cea84eff3dee4
diff --cc Documentation/git-replay.adoc
index c3b214ec69,dc966486ca..8d696ce3ab
--- a/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]]