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 <code@khaugsbakk.name> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kristoffer Haugsbakk committed
Dec 13, 2025 at 14:46 UTC
8467c95419acaa826a6c1ca0db0f36a3fd614ae4
1 file changed
+4
Documentation/git-replay.adoc
+4
@@ -81,6 +81,10 @@ the shape of the history being replayed. When using `--advance`, the
81
number of refs updated is always one, but for `--onto`, it can be one
82
or more (rebasing multiple branches simultaneously is supported).
83
84
+There is no stderr output on conflicts; see the <<exit-status,EXIT
85
+STATUS>> section below.
86
+
87
+[[exit-status]]
88
EXIT STATUS
89
-----------
90