From: Johannes Sixt <j6t@kdbg.org>
Date: Thu, 16 Aug 2012 20:52:39 GMT
Subject: Re: [PATCH] man: git pull -r is a short for --rebase
Message-ID: <502D5D97.3020906@kdbg.org>
In-Reply-To: <7v1uj63iyx.fsf@alter.siamese.dyndns.org>

Am 16.08.2012 18:22, schrieb Junio C Hamano:
> 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,

Are you sure? This adds '-r', not '--r', i.e., the single-letter option
'r', to the documentation, which is not something we want to hide, usually.

-- Hannes