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

From: Philip Oakley <philipoakley@iee.org>
Date: Aug 16, 2012, 19:59 UTC
Message-ID: <2BB1E674DD214C66B06660612F34109D@PhilipOakley>
In-Reply-To: <7v1uj63iyx.fsf@alter.siamese.dyndns.org>

From: "Junio C Hamano" <gitster@pobox.com>
Sent: Thursday, August 16, 2012 5:22 PM

Show 21 quoted lines

> Miklos Vajna <vmiklos@suse.cz> writes:
>
>> ---
>>  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.

I wasn't aware of the "abbreviated options" capability. Is meant to be in the man pages as I couldn't find it, or is it described differently?

Just adding the '-r' part of the option did seem sensible to me as a relative newbie.

Show 17 quoted lines

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

The extra one liner (-r|--r|--re|--reb|--reba|--rebas) would be readable though not pretty, but the seven line version would be horrible!

Philip