From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?ISO-8859-1?Q?Dirk_S=FCsserott?= Subject: Re: Merging/joining two repos (repo2 should be a subdirectory of repo1) Date: Sun, 30 Sep 2012 17:38:04 +0200 Message-ID: <5068675C.8030706@dirk.my1.cc> References: <506862A1.8000508@dirk.my1.cc> <269806202.iK1l2OpKr4@blacky> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Git Mailing List To: Sascha Cunz X-From: git-owner@vger.kernel.org Sun Sep 30 17:38:19 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TILb0-0001hh-Qt for gcvg-git-2@plane.gmane.org; Sun, 30 Sep 2012 17:38:19 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751160Ab2I3PiI (ORCPT ); Sun, 30 Sep 2012 11:38:08 -0400 Received: from smtprelay06.ispgateway.de ([80.67.31.104]:37453 "EHLO smtprelay06.ispgateway.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750878Ab2I3PiH (ORCPT ); Sun, 30 Sep 2012 11:38:07 -0400 Received: from [84.176.34.171] (helo=[192.168.2.100]) by smtprelay06.ispgateway.de with esmtpa (Exim 4.68) (envelope-from ) id 1TILam-0005VV-Qg; Sun, 30 Sep 2012 17:38:04 +0200 User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 In-Reply-To: <269806202.iK1l2OpKr4@blacky> X-Df-Sender: NzU3NjQ2 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Am 30.09.2012 17:34 schrieb Sascha Cunz: > > You might want to have a look at the subtree merge strategy (see man > git-merge). Maybe that will already do what you want to. > > > > Sascha > Thank you as well. I wasn't aware of that option (or didn't figure out what it actually does). Dirk