diff options
| author | Kristoffer Haugsbakk <code@khaugsbakk.name> | 2025-12-13 14:46:56 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-14 15:56:01 +0900 |
| commit | 8467c95419acaa826a6c1ca0db0f36a3fd614ae4 (patch) | |
| tree | b0f76e941887e1131ce52f8884de5f5c386567b3 | |
| parent | bdc5341ff65278a3cc80b2e8a02a2f02aa1fac06 (diff) | |
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>
| -rw-r--r-- | Documentation/git-replay.adoc | 4 |
1 files changed, 4 insertions, 0 deletions
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 <<exit-status,EXIT +STATUS>> section below. + +[[exit-status]] EXIT STATUS ----------- |