Re: Merging/joining two repos (repo2 should be a subdirectory of repo1)

Am 30.09.2012 22:44 schrieb David Aguilar: > On Sun, Sep 30, 2012 at 8:32 AM, Dirk Süsserott > wrote: >> Am 30.09.2012 17:24 schrieb Tomas Carnecky: >>> On Sun, 30 Sep 2012 17:17:53 +0200, Dirk SÃŒsserott >>> wrote: >>>> Hi! >>>> >&g

Re: Merging/joining two repos (repo2 should be a subdirectory of repo1)

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 --

Re: Merging/joining two repos (repo2 should be a subdirectory of repo1)

Am 30.09.2012 17:24 schrieb Tomas Carnecky: > On Sun, 30 Sep 2012 17:17:53 +0200, Dirk SÃŒsserott > wrote: >> Hi! >> >> I have repo1 with ~4 years of history and another repo2 with ~1 year of >> history, both of which I don't want to loose. Now I want to join them so >> that repo2 becomes a subdi

Merging/joining two repos (repo2 should be a subdirectory of repo1)

Hi! I have repo1 with ~4 years of history and another repo2 with ~1 year of history, both of which I don't want to loose. Now I want to join them so that repo2 becomes a subdirectory whithin repo1, including all the history of repo2. A simple git-merge won't do because both repos have some same f