Git development
 help / color / mirror / Atom feed
From: "Michal Suchánek" <msuchanek@suse.de>
To: Matthias Beyer <mail@beyermatthias.de>
Cc: git@vger.kernel.org, neikos@neikos.email
Subject: Re: Programmatically edit the git rebase sequence?
Date: Fri, 3 Jul 2026 14:17:45 +0200	[thread overview]
Message-ID: <akeoaWAkrENbpi1G@kunlun.suse.cz> (raw)
In-Reply-To: <akei64goQf3nFhX4@hikari>

On Fri, Jul 03, 2026 at 02:02:33PM +0200, Matthias Beyer wrote:
> Hi git people,
> 
> in a recent conversation at work, the question of how to
> programmatically edit the git-rebase sequence came up.
> 
> Example use case:
> 
> I have a branch that touches a number of files, adds some files and
> removes some files.
> When rebasing, I want to split all commits that touched a certain subset
> of files, for the clearity of the history.
> 
> I look at the output of
> 
>     git log master..mybranch --oneline --diff-filter=M -- "./subdir/*.rs"
> 
> to find all commits in that subdir that only touched the files. All of
> these commits are to be "edit"ed.
> 
> Now I fire up `git rebase -i master` and manually(!) match the list from
> above `git-log` call and find the respective commits to edit them.
> 
> Is there a way I am not aware of to do that manual step programatically?
> Something like
> 
>     git rebase -i master --edit-commits="$(git log master..mybranch --diff-filter=M --format="%H" -- "./subdir/*.rs")"
> 
> would be convenient here, although I would understand if that is too
> much clutter for the already very heavy git CLI interface :-)
> 
> Maybe I am just not aware of the obvious solution - I would be happy to
> learn that there is already one!

Hello,

you could probably set a script as EDITOR (environment variable). Not
great for one-off scripts I guess.

Thanks

Michal

  reply	other threads:[~2026-07-03 12:17 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-03 12:02 Programmatically edit the git rebase sequence? Matthias Beyer
2026-07-03 12:17 ` Michal Suchánek [this message]
2026-07-03 13:42 ` brian m. carlson
2026-07-03 14:33   ` Matt Hunter
2026-07-03 15:31   ` D. Ben Knoble

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=akeoaWAkrENbpi1G@kunlun.suse.cz \
    --to=msuchanek@suse.de \
    --cc=git@vger.kernel.org \
    --cc=mail@beyermatthias.de \
    --cc=neikos@neikos.email \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox