global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-09 01:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

doc: replay: mention no output on conflicts

Browse Source 
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>
This commit is contained in:
Kristoffer Haugsbakk
2025-12-13 14:46:56 +01:00
committed by Junio C Hamano
parent bdc5341ff6
commit 8467c95419
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-replay.adoc
View File

@@ -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
-----------