From: Junio C Hamano Date: Tue, 23 Dec 2025 02:33:37 +0000 (+0900) Subject: Merge branch 'pw/replay-drop-empty' into jch X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b72d8abc8b283368de8d8d664e10ba6cc834594;p=thirdparty%2Fgit.git 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 --- 7b72d8abc8b283368de8d8d664e10ba6cc834594 diff --cc Documentation/git-replay.adoc index 4c61f3aa1f,96a3a557bf..dc966486ca --- a/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. :: - Range of commits to replay. More than one can - be passed, but in `--advance ` mode, they should have - a single tip, so that it's clear where 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 ` mode, the + range should have a single tip, so that it's clear to which tip the - advanced should point. ++ advanced 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[]