Re: Very complex rebasing - Need help

From: Jakub Narebski <jnareb@gmail.com>
Date: Sep 8, 2006, 13:43 UTC
Message-ID: <edrs0d$42k$1@sea.gmane.org>
In-Reply-To: <6208897.post@talk.nabble.com>

Jehreg wrote:

Show 6 quoted lines

> In the Buildroot repo:
> initial--o--o--ID3--o--o--ID4--o--master
>                   \
>                    --o--o--o--o--o--o--o--o--myproject
> 
> My problem is that I need to kinda-rebase the ID4 into the myproject

branch

Show 8 quoted lines

> to make it finally look like this:
> 
> initial--o--o--ID3--o--o--ID4--o--master
>                   \               \
>                    --o--o--o--o--o--x--o--o--myproject
> 
> 
> Any ideas ?

Grafts? Grafting additional parent to commit x.

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git