From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 07 Dec 2025 21:58:13 GMT
Subject: Re: [PATCH 0/3] doc: replay: improvements like "mention no output on conflicts"
Message-ID: <xmqq1pl6lzt6.fsf@gitster.g>
In-Reply-To: <CV_replay_conflict.101@msgid.xyz>

kristofferhaugsbakk@fastmail.com writes:

> From: Kristoffer Haugsbakk <code@khaugsbakk.name>
>
> Explicitly say that conflicts do not give any output. I found this a bit
> confusing with the current doc since I am used to other commands
> complaining loudly.
>
> Also two other things:
>
> Kristoffer Haugsbakk (3):
>   doc: replay: mention no output on conflicts
>   doc: replay: document --contained
>   doc: replay: link section using markup
>
>  Documentation/git-replay.adoc | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
>
>
> base-commit: bdc5341ff65278a3cc80b2e8a02a2f02aa1fac06

All looked sensible.

The second one looked a bit sketchy, but that was the phrase used by
the log message for c4611130 (replay: add --contained to rebase
contained branches, 2023-11-24).