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? 1. my configuration: ~/git-gui$ git-remote show git * remote git URL: git://git.kernel.org/pub/scm/git/git.git Tracked remote branches master ~/git-gui$ git-remote show origin * remote origin URL: git://repo.or.cz/git-gui Remote branch(es) merged with 'git pull' while on branch master master Tracked remote branches master ~/git-gui$ gtlg --pretty=oneline --topo-order --first-parent | wc -l 584 2. pull with subtree strategy ~/git-gui$ git-pull -s subtree git master:master 3. after pull, all logs of git comes into git-gui (584->11985) ~/git-gui$ gtlg --pretty=oneline --topo-order | wc -l 11985 4. histories of git can be hiden by --first-parent gtlg --pretty=oneline --topo-order --first-parent | wc -l 585 -- 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
