From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 31 Jan 2013 20:44:50 GMT
Subject: Re: [PATCH 2/7] Undocument deprecated alias 'push.default=tracking'
Message-ID: <7vsj5hf5fh.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7vwqutf5jv.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> Jonathan Nieder <jrnieder@gmail.com> writes:
>
>> Am I really the only one that doesn't see the "--print" change as
>> hiding an option and sees burying "tracking" in the text as
>> qualitatively different?
>
> Sorry, but I do not understand the question.
>
> We are hiding/burying the "--print" option to make it clear that it
> is not a member with the same footing as others belonging to the
> group of options to the command.  It is accepted, but there is no
> reason for the user to choose it over --normalize.
>
> We want to make sure that "tracking" does not appear as if it is a
> member of the pull.default set with equal rights as others.  It is
> accepted, but there is no reason for the user to choose it over
> "upstream".

Now I re-read the proposed update, I think it is an improvement over
a straight revert in that it makes it clear that 'tracking' does not
belong, but I still think it is better to make it a sidenote to the
'upstream'.  It makes the connection between the two stronger.