From: Johannes Sixt <j.sixt@viscovery.net>
Date: Mon, 26 May 2008 11:10:42 GMT
Subject: Re: how to union 2 repos
Message-ID: <483A9AB2.706@viscovery.net>
In-Reply-To: <1211796504.20622.26.camel@bee.datamax.bg>

Jamil Djadala schrieb:
> i have 2 repos with history, assuming initial commit in both repos are
> same:
> 
> 1:
> a-b-c-d-e-f
> 2:
> a-B-C-D-E-F
> 
> 
> i want repository with this history:
> 
> a-b-c-d-e-f
>  \B-C-D-E-F

$ git fetch ../other master:otherMaster
$ echo $B $a > .git/info/grafts
$ git filter-branch -- --all

The man page of git-filter-branch mentions the grafts trick.

-- Hannes