All of lore.kernel.org
 help / color / mirror / Atom feed
From: Toon Claes <toon@iotcl.com>
To: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>,
	Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Kristoffer Haugsbakk <code@khaugsbakk.name>,
	Christian Couder <christian.couder@gmail.com>,
	Elijah Newren <newren@gmail.com>,
	Siddharth Asthana <siddharthasthana31@gmail.com>
Subject: Re: [PATCH 0/3] doc: replay: improvements like "mention no output on conflicts"
Date: Mon, 08 Dec 2025 15:29:33 +0100	[thread overview]
Message-ID: <877buxvygi.fsf@iotcl.com> (raw)
In-Reply-To: <d2a72ba5-ac7c-490f-9f2c-6cf849e65180@app.fastmail.com>

"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com> writes:

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

Yeah I agree it's unusual, and I'm considering to submit patches to
change that behavior. But for now, thanks for adding these docs changes.

> On Sun, Dec 7, 2025, at 22:58, Junio C Hamano wrote:
>>
>> 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?

I understand it might sound a bit cryptic, if you don't have any prior
knowledge about this command. But on the other hand, I don't have any
good idea how you can document this in more detail. I think it's fine
like this.

Overall, I agree with these changes.

-- 
Cheers,
Toon

  parent reply	other threads:[~2025-12-08 14:29 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 ` [PATCH 1/3] doc: replay: mention no output on conflicts kristofferhaugsbakk
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 [this message]
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=877buxvygi.fsf@iotcl.com \
    --to=toon@iotcl.com \
    --cc=christian.couder@gmail.com \
    --cc=code@khaugsbakk.name \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=kristofferhaugsbakk@fastmail.com \
    --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.