From: Jeff King Date: Sun, 05 Aug 2007 10:05:32 GMT Subject: Re: Terminology question about remote branches. Message-ID: <20070805100532.GG12507@coredump.intra.peff.net> In-Reply-To: <85ejijgzzg.fsf@lola.goethe.zz> On Sat, Aug 04, 2007 at 04:01:55PM +0200, David Kastrup wrote: > So --track does not set up a tracking branch, but makes a local > _following_ branch _refer_ to a tracking branch. A minor nit, but --track sets up a local following branch to refer to a remote's branch, _not_ to the tracking branch. In other words, if you look at the config: [branch "master"] remote = origin merge = refs/heads/master It does _not_ reference the tracking branch "refs/remotes/origin/master", but rather the remote's name for the branch "refs/heads/master". There was much discussion of this topic, but the general idea was not to require remote tracking branches for this feature to be used (a position I somewhat disagree with, but then I'm not the maintainer). -Peff