git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Miklos Vajna <vmiklos@suse.cz>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j6t@kdbg.org>, git@vger.kernel.org
Subject: Re: [PATCH] man: git pull -r is a short for --rebase
Date: Fri, 17 Aug 2012 07:38:26 +0200	[thread overview]
Message-ID: <20120817053826.GB22313@suse.cz> (raw)
In-Reply-To: <7vzk5uzgqa.fsf@alter.siamese.dyndns.org>

On Thu, Aug 16, 2012 at 02:09:33PM -0700, Junio C Hamano <gitster@pobox.com> wrote:
> 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.

I agree that it's a bit strange, but based on a quick search, it seems
multiple projects already advertise git pull -r (i.e. not --rebase and
not a configuration option):

http://lilypond.org/doc/v2.15/Documentation/contributor/pulling-and-rebasing
http://wiki.documentfoundation.org/Git_For_LibreOffice_Developers
http://www.wiremod.com/forum/wiremod-general-chat/29517-git-introduction-incomplete-unformatted.html

So it seems making -r refer to --recurse-submodules would already cause
quite some pain to users.

  reply	other threads:[~2012-08-17  5:38 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
2012-08-17  5:38         ` Miklos Vajna [this message]
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=20120817053826.GB22313@suse.cz \
    --to=vmiklos@suse.cz \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    /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).