Hello Jérôme, > I added Marc's branch as a remote branch so I have this in my > .git/config file : > > [...] > [remote "octo"] > url = git://github.com/octo/collectd.git > fetch = +refs/heads/jr/varnish:refs/remotes/octo/jr/varnish > [remote "mfournier"] > url = http://github.com/mfournier/collectd.git > fetch = +refs/heads/master:refs/remotes/mfournier/master > [...]
I have something looking like: [remote "jeromer"] url = git://github.com/jeromer/collectd.git fetch = +refs/heads/*:refs/remotes/jeromer/* [remote "octo"] url = git://github.com/octo/collectd.git fetch = +refs/heads/*:refs/remotes/octo/* [remote "mf"] url = [email protected]:mfournier/collectd.git fetch = +refs/heads/*:refs/remotes/mf/* This allows git to know about every branch in each of the 3 remote repositories. Then, I often have a "gitk --all" running. This helps a lot understanding how all these commits are stacked. > But whenever I run git merge mfournier/master <revnumber> git just merges > everything (34 commits) and not only the one I want. Did I do something wrong > ? Hmm, I'm not 100% sure but I think that if you pass 2 commits (remember of a branch as a label attached to a commit) to "merge", git will do an octopus (=multiple) merge between both branch heads AND the current branch. I guess this is not what you were expecting... You probably want something like this, which should inform you of your master branch getting fast-forwarded: git checkout master git merge mfournier/master I hope this will help ! Marc _______________________________________________ collectd mailing list [email protected] http://mailman.verplant.org/listinfo/collectd
