From: kristofferhaugsbakk@fastmail.com
To: git@vger.kernel.org
Cc: Kristoffer Haugsbakk <code@khaugsbakk.name>,
christian.couder@gmail.com, newren@gmail.com,
Siddharth Asthana <siddharthasthana31@gmail.com>
Subject: [PATCH 1/3] doc: replay: mention no output on conflicts
Date: Sun, 7 Dec 2025 18:55:09 +0100 [thread overview]
Message-ID: <no_output_on_conflict.102@msgid.xyz> (raw)
In-Reply-To: <CV_replay_conflict.101@msgid.xyz>
From: Kristoffer Haugsbakk <code@khaugsbakk.name>
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>
---
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
next prev parent reply other threads:[~2025-12-07 17:55 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-07 17:55 [PATCH 0/3] doc: replay: improvements like "mention no output on conflicts" kristofferhaugsbakk
2025-12-07 17:55 ` kristofferhaugsbakk [this message]
2025-12-07 17:55 ` [PATCH 2/3] doc: replay: document --contained kristofferhaugsbakk
2025-12-07 17:55 ` [PATCH 3/3] doc: replay: link section using markup kristofferhaugsbakk
2025-12-07 21:58 ` [PATCH 0/3] doc: replay: improvements like "mention no output on conflicts" Junio C Hamano
2025-12-08 7:28 ` Kristoffer Haugsbakk
2025-12-08 12:41 ` Junio C Hamano
2025-12-09 18:05 ` Kristoffer Haugsbakk
2025-12-09 23:02 ` Junio C Hamano
2025-12-08 14:29 ` Toon Claes
2025-12-08 14:35 ` Kristoffer Haugsbakk
2025-12-08 16:00 ` Phillip Wood
2025-12-09 18:03 ` Kristoffer Haugsbakk
2025-12-09 22:57 ` Junio C Hamano
2025-12-10 9:51 ` Phillip Wood
2025-12-10 11:56 ` Junio C Hamano
2025-12-10 12:04 ` Kristoffer Haugsbakk
2025-12-10 14:14 ` Phillip Wood
2025-12-10 15:40 ` Elijah Newren
2025-12-13 13:46 ` [PATCH v2 " kristofferhaugsbakk
2025-12-13 13:46 ` [PATCH v2 1/3] doc: replay: mention no output on conflicts kristofferhaugsbakk
2025-12-13 13:46 ` [PATCH v2 2/3] replay: improve --contained and add to doc kristofferhaugsbakk
2025-12-13 13:46 ` [PATCH v2 3/3] doc: replay: link section using markup kristofferhaugsbakk
2025-12-15 10:13 ` [PATCH v2 0/3] doc: replay: improvements like "mention no output on conflicts" Phillip Wood
2025-12-15 11:59 ` Kristoffer Haugsbakk
2025-12-16 0:29 ` Junio C Hamano
2025-12-16 14:25 ` Phillip Wood
2025-12-20 19:34 ` Kristoffer Haugsbakk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=no_output_on_conflict.102@msgid.xyz \
--to=kristofferhaugsbakk@fastmail.com \
--cc=christian.couder@gmail.com \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=siddharthasthana31@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.