Re: Find successor of common ancestor

From: Andreas Schwab <schwab@linux-m68k.org>
Date: Jul 16, 2010, 12:29 UTC
Message-ID: <m2aaprr4ny.fsf@igel.home>
In-Reply-To: <20100716090613.GB22894@nibiru.local>

Enrico Weigelt <weigelt@metux.de> writes:

Show 19 quoted lines

> * Santi Béjar <santi@agolina.net> wrote:
>> On Fri, Jul 16, 2010 at 10:29 AM, Enrico Weigelt <weigelt@metux.de> wrote:
>> >
>> > Hi folks,
>> >
>> >
>> > suppose the following situation:
>> >
>> > I've forked some branch A into B, now A and B have evolved
>> > independently for quite some time into A' and B'. Now I'd like
>> > to rebase B' along A' history line step by step - first on A+1,
>> > then A+3, ... until A' (that's what I'd call zip-rebase).
>> 
>> This is just what "git rebase"  does:
>> 
>> $ git checkout B'
>> $ git rebase A'
>
> Yes, but I need to find out A+1 for my zip-rebase.

git rev-list [--first-parent] A..A' | tac | while read rev; do git rebase $rev; done

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."