Re: "bubbling up" patches in a commit sequence.

From: Jeff King <peff@peff.net>
Date: Aug 14, 2022, 06:43 UTC
Message-ID: <YviZho4/BlRRNWEn@coredump.intra.peff.net>
In-Reply-To: <CANgJU+VYSuEkU+V0WRpsTPv9iPYeDo52MeMHuD7-Yp4JnA60NA@mail.gmail.com>

On Sat, Aug 13, 2022 at 10:45:53AM +0200, demerphq wrote:

Show 8 quoted lines

> In general I do this when I want to find a "fixup" pair that should be
> merged together before the PR is pushed, but there are other reasons,
> sometimes a PR contains a number of sub topics which are evolving and
> using this technique  can help the patches related to different sub
> topics be grouped together for easier review.
> 
> Anybody created tooling to do something like this? Or suggestions on
> how to approach it efficiently?

I haven't used these myself, but there are some projects that might do what you want:

   - https://github.com/tummychow/git-absorb

   - https://github.com/torbiak/git-autofixup

> Please forgive me for not using the correct specialist git jargon for
> these concepts, if there is any.

I think the key term is "absorb", but don't feel bad. I didn't remember that either, but only had a vague feeling I had seen something recently. I skimmed the "tools" section of the last couple issues of Git Rev News (thanks, Rev News editors!) which led me to autofixup, which mentioned "absorb". :)

-Peff