From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j6t@kdbg.org>
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 14:09:33 -0700 [thread overview]
Message-ID: <7vzk5uzgqa.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7v4no21raw.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Thu, 16 Aug 2012 14:05:11 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Johannes Sixt <j6t@kdbg.org> writes:
>
>> 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.
>
> I actually think "--rebase" squatting on short-and-sweet "-r" was an
> accident, and we are saved by not endorsing "pull -r" by documenting
> it. We can still use "-r" for "--recurse-submodules" if that proves
> to give more value than "--rebase" to our users.
>
> So I dunno. I personally do not think either deserves a short-and-sweet
> single letter option.
I guess the above needs a bit of clarification.
The reason I do not think "pull -r" gives much value to the users to
trigger "pull --rebase" is because the use of "pull --rebase" is
very project specific. If you are working on a project that forbids
merges, you would _always_ want to run "pull --rebase", which means
you would likely have it configured and would not be typing from the
command line.
next prev parent reply other threads:[~2012-08-16 21:09 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
2012-08-16 21:05 ` Junio C Hamano
2012-08-16 21:09 ` Junio C Hamano [this message]
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=7vzk5uzgqa.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--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).