"Shawn O. Pearce" <spearce@xxxxxxxxxxx> writes: >> 2. pull with subtree strategy >> ~/git-gui$ git-pull -s subtree git master:master > > You are merging in the wrong direction. You want to merge git-gui > into git.git: > > git clone git://repo.or.cz/alt-git.git mygit > cd mygit > git pull -s subtree git://repo.or.cz/git-gui.git master > > So you are pulling git-gui into git, not the reverse. Actually, subtree strategy was designed to allow merging back and forth. But the result, as it _is_ a merge, will not omit any commit from the history from both branches. - 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
