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

Junio C Hamano [off-list ref] writes:

Johannes Sixt [off-list ref] writes:

quoted

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.

On Thu, Aug 16, 2012 at 02:09:33PM -0700, Junio C Hamano [off-list ref] 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.