Re: Very complex rebasing - Need help

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Jehreg wrote:

> 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
> 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


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]