Yin Ping <pkufranky@xxxxxxxxx> wrote: > 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 > > When i merged git.git into git-gui with subtree strategy, I found all > histories of git.git merged into histories of git-gui (from 584 > history entries to 11985). Is it possible that only histories related > to git-gui subdirectory in git.git(i.e. histories displayed by git-log > git-gui) are merged into? > > 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. But yes, when this happens the entire history of the pulled project (in the above case git-gui) suddenly appears in the history of the parent project (in this case git). If you don't want this to happen then you need to make git-gui into a submodule. That has been talked about being done, but hasn't happened yet in the main git repository. git-gui is currently still being subtree merged in. -- Shawn. - 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
