On 10/28/07, Peter Baumann <waste.manager@xxxxxx> wrote: > Have a look at the subtree merge strategy [1] and at the following > explanations how git-gui got initally merged. > > -Peter > > [1]: http://www.gelato.unsw.edu.au/archives/git/0702/40139.html > [2]: http://www.gelato.unsw.edu.au/archives/git/0702/39661.html > 3x. I have seen that subtree stategy is introduced in commit 68fa. However, I don't find any description in manual of git-merge. Should this be added to this manual or any other document? -- franky - 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