Re: [PATCH] man: git pull -r is a short for --rebase

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 16, 2012, 16:22 UTC
Message-ID: <7v1uj63iyx.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20120816095018.GD5489@suse.cz>

Miklos Vajna <vmiklos@suse.cz> writes:

Show 16 quoted lines

> ---
>  Documentation/git-pull.txt |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
> index defb544..67fa5ee 100644
> --- a/Documentation/git-pull.txt
> +++ b/Documentation/git-pull.txt
> @@ -101,6 +101,7 @@ include::merge-options.txt[]
>  
>  :git-pull: 1
>  
> +-r::
>  --rebase::
>  	Rebase the current branch on top of the upstream branch after
>  	fetching.  If there is a remote-tracking branch corresponding to

I am not sure if this is worth it, as it comes from a natural "abbreviated options" support, i.e.

	-r|--r|--re|--reb|--reba|--rebas|--rebase)
		rebase=true

And I do not think we particularly want to do

    +-r::
    +--r::
    +--re::
    +--reb::
    +--reba::
    +--rebas::
     --rebase::
            Rebase the current...

for obvious reasons.