From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 26 Jun 2008 11:25:54 GMT
Subject: Re: how do I merge completely unrelated repositories ?
Message-ID: <alpine.DEB.1.00.0806261224020.9925@racer>
In-Reply-To: <20080626094522.GA29404@genesis.frugalware.org>

Hi,

On Thu, 26 Jun 2008, Miklos Vajna wrote:

> On Thu, Jun 26, 2008 at 11:39:37AM +0200, Christian MICHON <christian.michon@gmail.com> wrote:
> > How would you do it, since merge will not merge if it cannot find a
> > common ancestor ?
> 
> Did you try so?
> 
> If there are no conflicting paths then a simple
> 
> git pull /path/to/other/repo.git master
> 
> or similar should work.

FWIW this is how gitk got into git.git... See 5569bf9b(Do a cross-project 
merge of Paul Mackerras' gitk visualizer).  This also was often referred 
to as the "coolest merge ever".

Ciao,
Dscho