Re: [RFH] rebase -i optimization

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 26, 2009, 14:59 UTC
Message-ID: <alpine.DEB.1.00.0902261557300.6258@intel-tinevez-2-302>
In-Reply-To: <fabb9a1e0902260655g53fa1e1fg7e4aa76b0f3a80fc@mail.gmail.com>

Hi,

On Thu, 26 Feb 2009, Sverre Rabbelier wrote:

Show 11 quoted lines

> I am currently working on a large set of patches for Melange, and as
> such I'm using rebase -i a lot to polish things a bit. I do this
> mainly by 'git rebase -i master' from my topic branch, then change on
> of the 'pick' lines into an 'edit', and then fix up the commit and
> 'git rebase --continue'. Now I notice I'm waiting a lot for 'rebase
> -i' to finish picking the first bunch of commits that I didn't change.
> Now obviously I couldof done 'git rebase -i <foo>', but then I have
> first figure out what the last commit I want to change is.
> Would there be a reason to not reset to the last 'pick' commit instead
> of to the 'based on' branch (as long as there history is linear)? If
> so, what would be the best way to go around and implement this?

This code is supposed to do exactly what you want:

http://repo.or.cz/w/git/dscho.git?a=blob;f=git-rebase--interactive.sh;h=532f161c1ddce351cf623b096899e0eb057180ca;hb=8394eb1ecee00c2aba9212f3445c42078b41614b#l198

Unfortunately, it seems to be quite broken by all the different directions rebase -i was pulled to, but maybe you see the bug right away. Otherwise, I'll try to reschedule my Git time budget later tonight.

Ciao, Dscho