From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Wed, 20 Oct 2010 11:34:44 GMT
Subject: Re: Git terminology: remote, add, track, stage, etc.
Message-ID: <vpqfww1ksh7.fsf@bauges.imag.fr>
In-Reply-To: <BED961D6-5C2A-4535-B706-BFB9727CE398@gmail.com>

Thore Husfeldt <thore.husfeldt@gmail.com> 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/