From: Marc Branchaud <marcnarc@xiplink.com>
Date: Mon, 27 Oct 2008 15:43:44 GMT
Subject: Re: Terminology question: "tracking" branches
Message-ID: <4905E1B0.8040601@xiplink.com>
In-Reply-To: <490030AB.8090207@drmicha.warpmail.net>

Michael J Gruber wrote:
> 
> remote tracking branch: Synonymous with tracking branch. [remote is a
> noun, an object for track here]

Er, "remote" is an adjective there...  :)

> [adjective to be found] branch: A local branch which is set up to pull
> or rebase automatically from a tracking branch. Used for local
> modifications to remote branches. [I'm tempted to use local tracking
> branch here, but that would just add to the confusion.]

I say there's no need for an adjective here, as this is just a plain old 
branch that git-branch creates by default (right?).

What's needed is an adjective for when git-branch is given the 
--no-track option (or when branch.automergesetup is false). 
"Non-tracking branch" perhaps?

		Marc