From: Bernhard R. Link <brl+ccmadness@pcpool00.mathematik.uni-freiburg.de>
Date: Wed, 16 Feb 2011 10:54:27 GMT
Subject: Re: [PATCH] push.default: Rename 'tracking' to 'upstream'
Message-ID: <20110216105427.GA27909@pcpool00.mathematik.uni-freiburg.de>
In-Reply-To: <alpine.DEB.2.00.1102160421300.14950@debian>

* Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> [110216 10:43]:
> On Wed, 16 Feb 2011, Matthieu Moy wrote:
>
> > Johan Herland <johan@herland.net> writes:
> >
> > > In order to make this more understandable to the user, we rename the
> > > push.default == 'tracking' option to push.default == 'upstream'.
> >
> > While we're there, shouldn't we also rename 'branch.<remote>.merge' to
> > 'branch.<remote>.upstream'?
>
> I have a draft proposal not exactly to rename it, but to replace it by
> a new branch.<name>.upstream which would point to local ref rather
> than a ref on the remote, so one would have e.g.
> branch.topic.upstream = refs/remotes/origin/master.

Making it name a local ref name would also make it easier to add support
for listing multiple references.

The use case I miss support for (please hint me if this is already
possible somehow), is having multiple remotes where other people (or
more importantly I at other computers for projects without central
repository) add commits.

Currently one needs to fetch all the remotes and then manually do a
merge remote1/branchname remote2/branchname remote3/branchname and so
on. It would be nice if a single git pull could do that.

	Bernhard R. Link