Re: [PATCH] Add push --set-upstream

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 15, 2010, 21:01 UTC
Message-ID: <7vvdf3ulol.fsf@alter.siamese.dyndns.org>
In-Reply-To: <vpqy6jzuwpv.fsf@bauges.imag.fr>

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

Show 20 quoted lines

> Ilari Liusvaara <ilari.liusvaara@elisanet.fi> writes:
>
>> +
>> +-u::
>> +--set-upstream::
>> +	For every branch that is up to date or successfully pushed, add
>> +	upstream (tracking) reference for argument-less git pull.
>
> Not just argument-less git pull. git status is also impacted for
> example. Actually, we already have documentation for it in git-branch
> (--track option), and git-config (branch.<name>.merge configuration
> variable), so you should add a pointer to one of them.
>
> How about
>
> --set-upstream::
> 	For every branch that is up to date or successfully pushed, add
> 	upstream (tracking) reference, used by argument-less
> 	linkgit:git-pull[1] and other commands. For more information,
> 	see 'branch.<name>.merge' in linkgit:git-config[1].

Yeah, if we talked only about the configuration variable it wouldn't help users, but this description is reayy good.

> Or the --track option of branch and checkout should be renamed as
> --set-upstream, but that seems a lot of trouble for little benefit.

It might make sense to do so in the longer term UI clean-up, but I think that is largely an independent topic. By not introducing new places the confusing --track is used, we are at least not making things worse.