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

Re: Merging submodules

From
SBSanti Béjar <sbejar@gmail.com>
Date
Aug 1, 2008, 11:34 UTC
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
Previous: H.Merijn BrandNext: H.Merijn Brand
Message 13 of 18 in “Re: Merging submodules (was Re: Feature suggestion: git-hist)”
  1. Brian GernhardtJul 30, 2008
  2. H.Merijn BrandJul 31, 2008
  3. H.Merijn BrandJul 31, 2008
  4. Petr BaudisJul 31, 2008
  5. H.Merijn BrandJul 31, 2008
  6. Santi BéjarJul 31, 2008
  7. H.Merijn BrandJul 31, 2008
  8. Santi BéjarJul 31, 2008
  9. H.Merijn BrandJul 31, 2008
  10. H.Merijn BrandAug 1, 2008
  11. Santi BéjarAug 1, 2008
  12. H.Merijn BrandAug 1, 2008
  13. Santi BéjarAug 1, 2008
  14. H.Merijn BrandAug 4, 2008
  15. Petr BaudisAug 4, 2008
  16. H.Merijn BrandAug 4, 2008
  17. Petr BaudisAug 4, 2008
  18. Santi BéjarJul 31, 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.