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
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Dec 10, 2025, 14:14 UTC
Message-ID
<12b0e7dc-4c00-4f0e-bef7-ff76f3054b71@gmail.com>
In-Reply-To
<85ce46a9-a097-462a-aa1b-904eeb7b89ad@app.fastmail.com>
On 10/12/2025 12:04, Kristoffer Haugsbakk wrote:
Show 25 quoted lines
> On Wed, Dec 10, 2025, at 12:56, Junio C Hamano wrote:
>> Phillip Wood <phillip.wood123@gmail.com> writes:
>>
>>> We do talk about "branch heads" in our documentation and they point
>>> commits. We also use "tip" when talking about the commit the branch
>>> points to so maybe something like
>>>
>>>       Update all branches whose tip is replayed
>>>
>>> though I think it would be clearer if we could say "commit" somewhere as
>>> that's what we're replaying. I find the concept of "contained branches"
>>> rather obscure.
>>
>> Thanks, I do agree that "branch head", "tip of the branch", etc. can
>> be used pretty much interchangeably, and using "commit" somwhere
>> would make it clear.
>>
>> 	Update all branches that point at commits in the replayed
>> 	<revision-range>.
>>
>> perhaps?  I dunno.
> 
> I like this. Or just
> 
>      Update all branches that point at commits in <revision-range>.
I'd be happy with either one
Thanks
Phillip
Previous: Kristoffer HaugsbakkNext: Elijah Newren
Message 18 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.