On Thu, Jul 31, 2008 at 14:39, H.Merijn Brand <h.m.brand@xxxxxxxxx> wrote: > > There is a slight problem with this merging approach. The path names > are as they are/were in the submodules. In module_a, foo.pl was without > a leading module_a/ path, and now after integration, it still is. Is it > possible to rethink this whole process that integrates/merges the > several git repo's in subfolders into the current folder, as-if they > would have been in this folder in the first place? If you want to have module_a/foo.pl in the old commits you will need to rewrite the history, either with "git filter-branch" or fast-export/import, or importing again. For the new commits it depends on how you would do them. If you modify and commit without these module subfolders (without the module_a/.git as your git-merge-mods does) then the new commits will have module_a/foo.pl. So at the end you will have a merge of all the mods (using the subtree strategy), and after that you will have a single project. All depends in a few factors, if you have published the history (for the rewriting), if you want to have the module_# as independent projects (this way you can merge them in other projects),... Santi -- 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
