From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Fri, 11 Apr 2014 18:49:39 GMT
Subject: Re: [PATCH v3 0/8] Introduce publish tracking branch
Message-ID: <vpqeh13aegs.fsf@anie.imag.fr>
In-Reply-To: <1397239151-2391-1-git-send-email-felipe.contreras@gmail.com>

Felipe Contreras <felipe.contreras@gmail.com> writes:

> * Override other configurations (such as push.default)

I think I convinced myself that this is the right way to go since my
last message. After all, "push.default" is, by definition, just a
default.

> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -764,6 +764,13 @@ branch.<name>.mergeoptions::
>  	option values containing whitespace characters are currently not
>  	supported.
>  
> +branch.<name>.push::
> +	Defines, together with branch.<name>.pushremote, the publish branch for
> +	the given branch. It tells 'git push' which branch to push to, and
> +	overrides any other configurations, such as push.default. It also tells
> +	commands such as 'git status' and 'git branch' which remote branch to
> +	use for tracking information (commits ahead and behind).
> +

Good.

I think this text should mention the @{publish} shorthand too. Stg like
"This branch can be refered to as @{publish} when specifying revision
(see linkgit:gitrevisions[7])."

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