From 8467c95419acaa826a6c1ca0db0f36a3fd614ae4 Mon Sep 17 00:00:00 2001 From: Kristoffer Haugsbakk Date: Sat, 13 Dec 2025 14:46:56 +0100 Subject: [PATCH 1/3] doc: replay: mention no output on conflicts Some commands will produce output on stderr if there are conflicts, but git-replay(1) is completely silent. Explicitly spell that out. Signed-off-by: Kristoffer Haugsbakk Signed-off-by: Junio C Hamano --- Documentation/git-replay.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/git-replay.adoc b/Documentation/git-replay.adoc index dcb26e8a8e..6fbb527b9d 100644 --- a/Documentation/git-replay.adoc +++ b/Documentation/git-replay.adoc @@ -81,6 +81,10 @@ the shape of the history being replayed. When using `--advance`, the number of refs updated is always one, but for `--onto`, it can be one or more (rebasing multiple branches simultaneously is supported). +There is no stderr output on conflicts; see the <> section below. + +[[exit-status]] EXIT STATUS ----------- From 03d7c9c457ba68f28269dcd607b9026ea6c6c9c8 Mon Sep 17 00:00:00 2001 From: Kristoffer Haugsbakk Date: Sat, 13 Dec 2025 14:46:57 +0100 Subject: [PATCH 2/3] replay: improve --contained and add to doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no documentation for `--contained`. Start by copying the text from `replay_options` in `builtin/ replay.c`. But some people think that the existing text is a bit unclear; what does it mean for a branch to be contained in a revision range? Let’s include the implied commits here: the branches that point at commits in the range. Also use “update” instead of “advance”. “Update” is the verb commonly used in this context. Helped-by: Phillip Wood Helped-by: Junio C Hamano Signed-off-by: Kristoffer Haugsbakk Signed-off-by: Junio C Hamano --- Documentation/git-replay.adoc | 4 ++++ builtin/replay.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/git-replay.adoc b/Documentation/git-replay.adoc index 6fbb527b9d..1e2469b903 100644 --- a/Documentation/git-replay.adoc +++ b/Documentation/git-replay.adoc @@ -42,6 +42,10 @@ The history is replayed on top of the and is updated to point at the tip of the resulting history. This is different from `--onto`, which uses the target only as a starting point without updating it. +--contained:: + Update all branches that point at commits in + . Requires `--onto`. + --ref-action[=]:: Control how references are updated. The mode can be: + diff --git a/builtin/replay.c b/builtin/replay.c index 6606a2c94b..9e5ad64cad 100644 --- a/builtin/replay.c +++ b/builtin/replay.c @@ -377,7 +377,7 @@ int cmd_replay(int argc, N_("revision"), N_("replay onto given commit")), OPT_BOOL(0, "contained", &contained, - N_("advance all branches contained in revision-range")), + N_("update all branches that point at commits in ")), OPT_STRING(0, "ref-action", &ref_action, N_("mode"), N_("control ref update behavior (update|print)")), From 9ba08b30a117e6925a9e5e87c92b37de7396d3a4 Mon Sep 17 00:00:00 2001 From: Kristoffer Haugsbakk Date: Sat, 13 Dec 2025 14:46:58 +0100 Subject: [PATCH 3/3] doc: replay: link section using markup Signed-off-by: Kristoffer Haugsbakk Signed-off-by: Junio C Hamano --- Documentation/git-replay.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-replay.adoc b/Documentation/git-replay.adoc index 1e2469b903..22fd1b271a 100644 --- a/Documentation/git-replay.adoc +++ b/Documentation/git-replay.adoc @@ -19,7 +19,7 @@ the working tree and the index untouched. By default, updates the relevant references using an atomic transaction (all refs update or none). Use `--ref-action=print` to avoid automatic ref updates and instead get update commands that can be piped to `git update-ref --stdin` -(see the OUTPUT section below). +(see the <> section below). THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE. @@ -67,6 +67,7 @@ The default mode can be configured via the `replay.refAction` configuration vari include::rev-list-options.adoc[] +[[output]] OUTPUT ------