From: Jay Soffian <jaysoffian@gmail.com>
Date: Thu, 12 Mar 2009 01:16:11 GMT
Subject: Re: setting up tracking on push
Message-ID: <76718490903111816s3da97379x74e4ced2eae96ab2@mail.gmail.com>
In-Reply-To: <7vprgnlf3f.fsf@gitster.siamese.dyndns.org>

On Wed, Mar 11, 2009 at 9:11 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> http://article.gmane.org/gmane.comp.version-control.git/54822/
>
> I do not think the description of remote-tracking in that article is
> correct.  We use the word to call remote/origin/<name> that keeps copies
> of what we saw over there when we last observed.
>
> The way to mark local branches to merge with/rebase onto something else
> by default is --track option to "git branch" and "git checkout -b", and
> that is often used to mark them to --track remote-tracking branches but
> they do not have to --track remote-tracking branches.  They can --track
> local branches as well.

Yes, I noticed this as I re-read the thread. --track and --no-track
are unfortunately poorly named, but that's ancient history. I've
summarized the thread just before you sent this message. I'll update
my summary to note this point. :-)

j.