On Sep 28, 2010, at 3:51 PM, Eric Raible wrote: > On 11:59 AM, Brian Gernhardt wrote: >> > >> Your branches should be set to track automatically but if they didn't for >> some reason and are using v1.7.0 or newer, you can: >> >> $ git branch --set-upstream master origin/next >> Branch master set up to track remote branch next from origin. >> $ git pull >> >> If you're using git prior to v1.7.0, you can instead: >> >> $ git config branch.master.remote origin >> $ git config branch.master.merge refs/heads/master >> $ git pull > > Seems to me that to be equivalent, the first should be: > > git branch --set-upstream master origin/master > > or the second should be: > > git config branch.master.merge refs/heads/next > > Eh? Oops. I had forgotten to change the first one after some experimenting on the git.git repo. I had meant $ git branch --set-upstream master origin/master Far more repos have a master branch than a next one. ~~ Brian -- 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