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

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

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 8, 2026, 16:14 UTC
Message-ID
<xmqq33xtwj9m.fsf@gitster.g>
In-Reply-To
<CAL71e4MrQ25WJHp-08bTS2=y-gd36zs9CVYmYGeRv-6iCpdfdQ@mail.gmail.com>
Kristofer Karlsson <krka@spotify.com> writes:
Show 13 quoted lines
> I tried building v6 of kk/merge-base-exhaustion on top of
> kk/commit-reach-find-all-fix but since that one is based
> on kk/paint-down-to-common-optim it does not include
> the changes from kk/commit-reach-optim which I also depend
> on.
>
> I thus think the status of kk/merge-base-exhaustion should
> instead be:
> "On hold, waiting for kk/commit-reach-find-all-fix to land first."
>
> Alternatively you could rebase kk/commit-reach-find-all-fix
> on master (triggers a small conflict though) and that would
> also unblock a reroll (but I don't want to generate more work for you).

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.

Thanks.
Previous: Kristofer KarlssonNext: Kristofer Karlsson
Message 3 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.