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

Re: What's cooking in git.git (Jul 2026, #03)

From
Kristofer Karlsson <krka@spotify.com>
Date
Jul 8, 2026, 18:03 UTC
Message-ID
<CAL71e4O+9MEf59XkC4iqPoxt4T6iZ174hWrPTDcjPoWaURj=aA@mail.gmail.com>
In-Reply-To
<xmqq33xtwj9m.fsf@gitster.g>
On Wed, 8 Jul 2026 at 18:14, Junio C Hamano <gitster@pobox.com> wrote:
Show 13 quoted lines
>
> When topic A depends on topic B and topic C, rather than rebasing A
> on 'next' (if B and C are in 'next'), I would often do
>
>     $ git checkout -b A master
>     $ git merge --no-ff B
>     $ git merge --no-ff C
>
> these days to prepare the "base" to apply patches that belong to A.
>
> Many contributors mimic this and state in their cover letter that
> the patches in the series are to be applied on top of master at
> commit X with branches Y and Z merged, or something to that effect.

Yes, that worked locally for me but I think my mistake was that I started off using gitgitgadget which only supports workflows that reference an existing remote branch as base. In the future I will try to learn the b4 tool so I can save myself some headache.

Thanks for the guidance, Kristofer

Previous: Junio C Hamano
Message 4 of 4 in “What's cooking in git.git (Jul 2026, #03)”
  1. Junio C HamanoJul 7, 2026
  2. Kristofer KarlssonJul 8, 2026
  3. Junio C HamanoJul 8, 2026
  4. Kristofer KarlssonJul 8, 2026

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.