From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Fri, 15 Jan 2010 17:03:24 GMT
Subject: Re: [PATCH] Add push --set-upstream
Message-ID: <vpqy6jzuwpv.fsf@bauges.imag.fr>
In-Reply-To: <1263573407-13642-1-git-send-email-ilari.liusvaara@elisanet.fi>

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].

?

> +		OPT_BIT('u', "set-upstream", &flags, "Set upstream for git pull", TRANSPORT_PUSH_SET_UPSTREAM),

I'd be in favor of --track for the option name. Not that it's the best
name ever, but this is really doing the same job as branch --track and
checkout --track, so it should have the same name.

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

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