Thore Husfeldt <thore.husfeldt@xxxxxxxxx> writes: >> Branch bobsstuff set up to track remote branch master from bob. > > (By the way, I think âremote branchâ is useful and correct, here.) But "track" should be "upstream" here to be consistant with "--set-upstream". Maybe: Remote branch master from bob set as upstream for bobsstuff. ? > Let me see if I can use the proposed terminology: > > 1. bob/master *tracks* master. > 2. bob/master is a remote-tracking branch I do like the dash between remote and tracking. This is roughly the current terminology, but as you pointed out, it's not used consistantly in the doc. > 3. master is a remote branch > 4. bob/master has been marked as "upstream" from bobsstuff That's my understanding too. (no time for more detailed answer, sorry) -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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