diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-02-09 12:09:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-09 12:09:09 -0800 |
| commit | 8087aae54061d056b61da736664cea84eff3dee4 (patch) | |
| tree | 519fcd11e8cdd5952d7b148bae92cf1755298949 /Documentation | |
| parent | 7bf3785d0973d229fa21a76122c7e4735a2b1ffb (diff) | |
| parent | 0ee71f4bd035db61342c2c5a25984e4545347c11 (diff) | |
| download | git-8087aae54061d056b61da736664cea84eff3dee4.tar.xz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-replay.adoc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-replay.adoc b/Documentation/git-replay.adoc index c3b214ec69..8d696ce3ab 100644 --- a/Documentation/git-replay.adoc +++ b/Documentation/git-replay.adoc @@ -62,7 +62,9 @@ The default mode can be configured via the `replay.refAction` configuration vari 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[] |