From 8467c95419acaa826a6c1ca0db0f36a3fd614ae4 Mon Sep 17 00:00:00 2001 From: Kristoffer Haugsbakk Date: Sat, 13 Dec 2025 14:46:56 +0100 Subject: [PATCH] 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 -----------