Re: [PATCH 0/3] doc: replay: improvements like "mention no output on conflicts"

From: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date: Dec 8, 2025, 07:28 UTC
Message-ID: <d2a72ba5-ac7c-490f-9f2c-6cf849e65180@app.fastmail.com>
In-Reply-To: <xmqq1pl6lzt6.fsf@gitster.g>

On Sun, Dec 7, 2025, at 22:58, Junio C Hamano wrote:

Show 9 quoted lines

> kristofferhaugsbakk@fastmail.com writes:
>>[snip]
>> 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).

How should `--contained` be documented?

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.