[PATCH 1/3] doc: replay: mention no output on conflicts
From: <hidden>
Date: 2025-12-07 17:55:58
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
From: Kristoffer Haugsbakk <redacted> 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 <redacted> --- Documentation/git-replay.adoc | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/Documentation/git-replay.adoc b/Documentation/git-replay.adoc
index dcb26e8a8e8..6fbb527b9d8 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 <<exit-status,EXIT +STATUS>> section below. + +[[exit-status]] EXIT STATUS -----------
--
2.52.0.10.g08704017180