Hi, On Thu, 26 Jun 2008, Miklos Vajna wrote: > On Thu, Jun 26, 2008 at 11:39:37AM +0200, Christian MICHON <christian.michon@xxxxxxxxx> 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 -- 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
