git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: how do I merge completely unrelated repositories ?

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jun 26, 2008, 11:25 UTC
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:
Show 11 quoted lines
> 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

Previous: Christian MICHONNext: Miklos Vajna
Message 4 of 9 in “how do I merge completely unrelated repositories ?”
  1. Christian MICHONJun 26, 2008
  2. Miklos VajnaJun 26, 2008
  3. Christian MICHONJun 26, 2008
  4. Johannes SchindelinJun 26, 2008
  5. Miklos VajnaJun 26, 2008
  6. Oliver KullmannJun 26, 2008
  7. Asheesh LaroiaJun 26, 2008
  8. Kelly F. HickelJun 26, 2008
  9. Jakub NarebskiJun 26, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.