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