From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Fri, 18 Feb 2011 00:51:05 GMT
Subject: Re: [PATCH] push.default: Rename 'tracking' to 'upstream'
Message-ID: <alpine.DEB.2.00.1102171947230.14950@debian>
In-Reply-To: <7v8vxflv7p.fsf@alter.siamese.dyndns.org>

On Wed, 16 Feb 2011, Junio C Hamano wrote:

> As to its value being what the other end calls the source, I think it is
> not a good idea to change it, and it is even a worse idea to add a new
> configuration variable that points into the tracking branches on our side.
> @{upstream} is a short-hand notation to call the tracking branch of the
> "upstream" we have been discussing, and has to point at refs/remotes/
> hierarchy, but the entire point of the notation is that the users do not
> have to see/type "refs/remotes/" when they say
> 
>     $ git merge @{upstream}
> 
> but at the level of an end-user's world-view, his branch that was forked
> from origin's "master" integrates with origin's "master", and the use of
> an intermediary, the refs/remotes/origin/master remote tracking branch
> that is kept on the local side, is a mere implementation detail.