From: Santi Béjar <sbejar@gmail.com>
Date: Fri, 01 Aug 2008 11:34:42 GMT
Subject: Re: Merging submodules
Message-ID: <8aa486160808010434g7f3c187arc107b994e737cd74@mail.gmail.com>
In-Reply-To: <20080801123523.33c37e08@pc09.procura.nl>

On Fri, Aug 1, 2008 at 12:35, H.Merijn Brand <h.m.brand@xs4all.nl> wrote:

>
> After we join/merge these into the super-project, we're going to remove
> the sup-repos, so all new commits will be made in the super-repo.

If you'll remove the subrepos, the best thing would be to rewrite the
history on those subrepos just moving all the path to the
corresponding subfolder (with git-filter-branch, and you have exactly
what you need at the end of the example section in the manpage). And
then just do a normal merge. Or, even, you could try to create a
project with everything there in the correct order and location, I
don't know if git-filter-branch or git-fast-import/export (you have
some examples in git.git in contrib/fast-import) can do it, but if you
get it, please, post it here because it can be useful for others).

Santi