Re: Script to rebase branches

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: May 9, 2017, 10:50 UTC
Message-ID: <alpine.DEB.2.21.1.1705091244420.146734@virtualbox>
In-Reply-To: <20170509040943.j3n5li7fapiuvgbj@sigill.intra.peff.net>

Hi Peff,

On Tue, 9 May 2017, Jeff King wrote:

Show 14 quoted lines

> On Sat, May 06, 2017 at 12:23:32PM +0200, Lars Schneider wrote:
> 
> > I am about to write a bash/sh script that helps me to rebase a bunch of 
> > branches (e.g. select branches based on prefix, conflict resolution/
> > rerere support, ...).
> > 
> > I wonder if anyone has such a script already and is willing to share it.
> 
> This is what I use:
> 
>   https://github.com/peff/git/blob/meta/rebase
> 
> There's no documentation in the script, but the commit message in its
> history should give a good sense of what each part does.

That requires Meta/ to be checked out and up-to-date. I'd bet there are exactly two people who fall into that category.

Also, I see that you do not use worktrees. Otherwise your script would fail.

When I still hoped to be able to get the rebase--helper related topic branches in by August last year, I had grandiose plans to teach the sequencer not only to perform the Git garden shears' trick (i.e. recreate merges), but also to optionally update local branches corresponding to the merge commits, including updates to the worktrees that checked them out (if any).

Maybe I'll still get around to do this, some time this year. And it'll probably hit git.git by mid next year ;-)

Ciao, Dscho