git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 9, 2025, 23:02 UTC
Message-ID
<xmqqtsxzi7hx.fsf@gitster.g>
In-Reply-To
<753daaa4-e675-4d28-9c13-4f5ede0f3b47@app.fastmail.com>
"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com> writes:
Show 18 quoted lines
> On Mon, Dec 8, 2025, at 13:41, Junio C Hamano wrote:
>>>>[snip]
>>>>
>>>> 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?
>>
>> The text you added uses exactly the phrase used by the log message,
>> so the author of the feature apparently felt it is good enough ;-).
>>
>> It just felt that "contained in <revision-range>" is understandable
>> enough.
>
> “is [not]” presumably.
Actually, s/It felt/I was unsure/;-).
Show 19 quoted lines
>>     master..next?  If it is the former, is it because the topmost
>>     commit (i.e., the commit pointed at by the branch reference) is
>>     the only thing that counts, and it indeed is master..next?
>
> It’s a somewhat complex case compared to what I think is the usual one:
> a non-merge range of commits without any patch-id-equivalents on the
> target (fingers crossed). And the setup without merges: two topic
> branches in the range gives the output I expect:
>
>     git replay --contained --onto=target2 <range>
>     update <top/second>
>     update <bottom/first>
>
> I think the original phrasing is understandable. But we could add
> an example.
>
>     For example, if the range contains five commits where a branch
>     points to the newest commit and another branch points to the third
>     commit ...

Alternatively, you can explicitly refer to "the tip of the branch"; that phrasing will be understood by people from both camps. Those who considers that a "branch" consists of the commits between the fork point and its tip, and those who thinks a "branch" is a fancy name attached to one particular commit in the DAG that can move around (typically forward). Those branches whose tips are within the range are updated.

Previous: Kristoffer HaugsbakkNext: Toon Claes
Message 9 of 28 in “doc: replay: improvements like "mention no output on conflicts"”
  1. 0/3 doc: replay: improvements like "mention no output on conflicts"kristofferhaugsbakk@fastmail.com, Dec 7, 2025
  2. 1/3 doc: replay: mention no output on conflictskristofferhaugsbakk@fastmail.com, Dec 7, 2025
  3. 2/3 doc: replay: document --containedkristofferhaugsbakk@fastmail.com, Dec 7, 2025
  4. 3/3 doc: replay: link section using markupkristofferhaugsbakk@fastmail.com, Dec 7, 2025
  5. Junio C HamanoDec 7, 2025
  6. Kristoffer HaugsbakkDec 8, 2025
  7. Junio C HamanoDec 8, 2025
  8. Kristoffer HaugsbakkDec 9, 2025
  9. Junio C HamanoDec 9, 2025
  10. Toon ClaesDec 8, 2025
  11. Kristoffer HaugsbakkDec 8, 2025
  12. Phillip WoodDec 8, 2025
  13. Kristoffer HaugsbakkDec 9, 2025
  14. Junio C HamanoDec 9, 2025
  15. Phillip WoodDec 10, 2025
  16. Junio C HamanoDec 10, 2025
  17. Kristoffer HaugsbakkDec 10, 2025
  18. Phillip WoodDec 10, 2025
  19. Elijah NewrenDec 10, 2025
  20. 0/3 doc: replay: improvements like "mention no output on conflicts"kristofferhaugsbakk@fastmail.com, Dec 13, 2025
  21. 1/3 doc: replay: mention no output on conflictskristofferhaugsbakk@fastmail.com, Dec 13, 2025
  22. 2/3 replay: improve --contained and add to dockristofferhaugsbakk@fastmail.com, Dec 13, 2025
  23. 3/3 doc: replay: link section using markupkristofferhaugsbakk@fastmail.com, Dec 13, 2025
  24. Phillip WoodDec 15, 2025
  25. Kristoffer HaugsbakkDec 15, 2025
  26. Junio C HamanoDec 16, 2025
  27. Phillip WoodDec 16, 2025
  28. Kristoffer HaugsbakkDec 20, 2025

Read the whole thread, see it on lore, or plain text.

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