On Thu, Jul 14, 2011 at 05:34:50AM -0700, Andrej wrote: > Is it possible to have fast-farwarded merges when using subtree merge > strategy? The problem is that I have multiple repos that I want to > pool in another separate repo using differnent folders. And I want > that the history of the pool repo being just composition of all > commits from all the subrepos. Just linear composition. I tried to use > subtree merge strategy as it is described on github > http://help.github.com/subtree-merge/ > But I get additional commits with messages like "Merge branch 'master' > of github.com:user/repo" that I don't want to. > > ``git pull -s subtree *** --ff *** repo master`` instead of just ``git > pull -s subtree repo master`` results in the same non-fast-forwarded > merge.
The merge commit is where your super-project actually lives. It does not exist, otherwise, so you cannot do without the merge. The super-project is the only one that points to its unique root tree object, of which the sub-projects are all sub-trees. Have you tried git-subtree? https://github.com/apenwarr/git-subtree git-subtree makes it easy to manage composite repositories. -- David -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
