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

Miklos Vajna [off-list ref] writes:

I am not sure if this is worth it, as it comes from a natural
"abbreviated options" support, i.e.

	-r|--r|--re|--reb|--reba|--rebas|--rebase)
		rebase=true

And I do not think we particularly want to do

    +-r::
    +--r::
    +--re::
    +--reb::
    +--reba::
    +--rebas::
     --rebase::
            Rebase the current...

for obvious reasons.

Hi,

On Thu, Aug 16, 2012 at 09:22:14AM -0700, Junio C Hamano [off-list ref] wrote:

I am not sure if this is worth it, as it comes from a natural
"abbreviated options" support, i.e.

	-r|--r|--re|--reb|--reba|--rebas|--rebase)
		rebase=true

I sent the patch as a (newcomer) friend today asked if it's intentional
that -r is undocumented in 'man git-pull'.

And I do not think we particularly want to do

    +-r::
    +--r::
    +--re::
    +--reb::
    +--reba::
    +--rebas::
     --rebase::
            Rebase the current...

for obvious reasons.

I agree, however, we already document -q and --quiet, or -v and
--verbose in the same manpage, so I think it would be consistent to have
-r there as well.

Thanks,

Miklos

From: "Junio C Hamano" <redacted>
Sent: Thursday, August 16, 2012 5:22 PM

Miklos Vajna [off-list ref] writes:

quoted

---
 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, i.e.

I wasn't aware of the  "abbreviated options" capability. Is meant to be 
in the man pages as I couldn't find it, or is it described differently?

Just adding the '-r' part of the option did seem sensible to me as a 
relative newbie.

-r|--r|--re|--reb|--reba|--rebas|--rebase)
rebase=true

And I do not think we particularly want to do

   +-r::
   +--r::
   +--re::
   +--reb::
   +--reba::
   +--rebas::
    --rebase::
           Rebase the current...

for obvious reasons.
--

The extra one liner (-r|--r|--re|--reb|--reba|--rebas)  would be 
readable though not pretty, but the seven line version would be 
horrible!

Philip 

Am 16.08.2012 18:22, schrieb Junio C Hamano:

Miklos Vajna [off-list ref] writes:

quoted

---
 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