Martin Langhoff <martin@xxxxxxxxxxxxxxx> writes: > If your tree is reasonably clean (so that the implied git-checkout won't > fail), then on 1.5.1 this Just Works > > git branch --track <branch> origin/<branch> > git pull # as needed At least in theory, with branch.autosetupmerge, you shouldn't even have to say --track there. I've never used it myself, though. - 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