From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Nov 2017 01:18:43 GMT
Subject: Re: [PATCH] branch doc: remove --set-upstream from synopsis
Message-ID: <xmqqzi7lu2h8.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20171116074643.19614-1-tmz@pobox.com>

Todd Zullinger <tmz@pobox.com> writes:

> Support for the --set-upstream option was removed in 52668846ea
> (builtin/branch: stop supporting the "--set-upstream" option,
> 2017-08-17), after a long deprecation period.
>
> Remove the option from the command synopsis for consistency.  Replace
> another reference to it in the description of `--delete` with
> `--set-upstream-to`.
>
> Signed-off-by: Todd Zullinger <tmz@pobox.com>
> ---

Makes sense.  Even though we internally still carry (and have to
carry) code to notice and explicitly reject "--set-upstream", I do
not think that we need to suggest its presence to the end user.

The option parsing code marks it with the PARSE_OPT_HIDDEN bit
correctly and it would make sense to make the synopsis section
follow suit.

Thanks.