From: Jeff King <peff@peff.net>
To: demerphq <demerphq@gmail.com>
Cc: Git <git@vger.kernel.org>
Subject: Re: "bubbling up" patches in a commit sequence.
Date: Sun, 14 Aug 2022 02:43:18 -0400 [thread overview]
Message-ID: <YviZho4/BlRRNWEn@coredump.intra.peff.net> (raw)
In-Reply-To: <CANgJU+VYSuEkU+V0WRpsTPv9iPYeDo52MeMHuD7-Yp4JnA60NA@mail.gmail.com>
On Sat, Aug 13, 2022 at 10:45:53AM +0200, demerphq wrote:
> 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
next prev parent reply other threads:[~2022-08-14 6:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-13 8:45 "bubbling up" patches in a commit sequence demerphq
2022-08-14 6:43 ` Jeff King [this message]
2022-08-15 12:25 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YviZho4/BlRRNWEn@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=demerphq@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).