Jakub Narebski <jnareb@xxxxxxxxx> 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/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html