On Thu, Jul 31, 2008 at 02:39:55PM +0200, H.Merijn Brand wrote: > On Thu, 31 Jul 2008 09:21:04 +0200, "H.Merijn Brand" > <h.m.brand@xxxxxxxxx> wrote: > > > I will now be playing with the results a bit. I have attached the > > script, in case you might want to use it in documentation or examples. > > For now, all the mods are hardcoded. No arguments and so on. > > > > Again, Thanks! > > 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? I would suggest re-reading Santi's suggestions: > You have, basically, two possibilities: > > 1) Add the module_# as submodules: > http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html > http://git.or.cz/gitwiki/GitSubmoduleTutorial > 2) Add the submodules as subtrees (as gitk and git-gui in git.git) > http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html I think the latter is specifically what you want. -- Petr "Pasky" Baudis As in certain cults it is possible to kill a process if you know its true name. -- Ken Thompson and Dennis M. Ritchie -- 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
