From: Johannes Sixt <j6t@kdbg.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Miklos Vajna <vmiklos@suse.cz>, git@vger.kernel.org
Subject: Re: [PATCH] man: git pull -r is a short for --rebase
Date: Thu, 16 Aug 2012 22:52:39 +0200 [thread overview]
Message-ID: <502D5D97.3020906@kdbg.org> (raw)
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
next prev parent reply other threads:[~2012-08-16 20:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-16 9:50 [PATCH] man: git pull -r is a short for --rebase Miklos Vajna
2012-08-16 16:22 ` Junio C Hamano
2012-08-16 19:45 ` Miklos Vajna
2012-08-16 20:21 ` Junio C Hamano
2012-08-16 20:26 ` Junio C Hamano
2012-08-16 19:59 ` Philip Oakley
2012-08-16 20:23 ` Junio C Hamano
2012-08-16 22:36 ` Philip Oakley
2012-08-17 6:19 ` Re* " Junio C Hamano
2012-08-17 18:22 ` Philip Oakley
2012-08-17 19:48 ` Junio C Hamano
2012-08-17 20:22 ` Philip Oakley
2012-08-16 20:52 ` Johannes Sixt [this message]
2012-08-16 21:05 ` Junio C Hamano
2012-08-16 21:09 ` Junio C Hamano
2012-08-17 5:38 ` Miklos Vajna
2012-08-17 6:18 ` Junio C Hamano
2012-08-17 7:04 ` Miklos Vajna
2012-08-17 7:32 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=502D5D97.3020906@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=vmiklos@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).