From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Wed, 16 Feb 2011 10:26:23 GMT
Subject: Re: [PATCH] push.default: Rename 'tracking' to 'upstream'
Message-ID: <vpqhbc4mg1c.fsf@bauges.imag.fr>
In-Reply-To: <201102161108.26637.jnareb@gmail.com>

Jakub Narebski <jnareb@gmail.com> writes:

> Actually while I think that it makes more sense to use local ref for
> 'branch.<name>.merge' because it is what is merged, i.e.:
>
>   branch.topic.merge = refs/remotes/origin/master
[...]
> I think that for 'branch.<name>.upstream' it would make more sense to
> use the name that *upstream* uses, i.e.
>
>   branch.topic.upstream = refs/heads/master

I disagree. Both --set-upstream and @{upstream} both refer to
refs/remotes/origin/master, i.e. the remote-tracking name in the local
repository, not to the local name in the remote repository.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/