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

2012-08-17 Thread Junio C Hamano
Miklos Vajna vmik...@suse.cz writes: 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

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

2012-08-17 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: From: Junio C Hamano gits...@pobox.com Sent: Thursday, August 16, 2012 9:23 PM Philip Oakley philipoak...@iee.org writes: 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

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

2012-08-17 Thread Miklos Vajna
On Thu, Aug 16, 2012 at 11:18:40PM -0700, Junio C Hamano gits...@pobox.com wrote: From: Miklos Vajna vmik...@suse.cz Date: Thu, 16 Aug 2012 11:50:18 +0200 Subject: [PATCH] man: git pull -r is a short for --rebase Letting the --rebase option squat on the short-and-sweet single letter option

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

2012-08-17 Thread Junio C Hamano
Miklos Vajna vmik...@suse.cz writes: On Thu, Aug 16, 2012 at 11:18:40PM -0700, Junio C Hamano gits...@pobox.com wrote: From: Miklos Vajna vmik...@suse.cz Date: Thu, 16 Aug 2012 11:50:18 +0200 Subject: [PATCH] man: git pull -r is a short for --rebase Letting the --rebase option squat on

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

2012-08-17 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Friday, August 17, 2012 7:19 AM Philip Oakley philipoak...@iee.org writes: From: Junio C Hamano gits...@pobox.com Sent: Thursday, August 16, 2012 9:23 PM Philip Oakley philipoak...@iee.org writes: I wasn't aware of the abbreviated options

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

2012-08-17 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: diff --git a/Documentation/git.txt b/Documentation/git.txt index ca85d1d..75b35ce 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -22,11 +22,13 @@ unusually rich command set that provides both high-level operations and full

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

2012-08-17 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Friday, August 17, 2012 8:48 PM Philip Oakley philipoak...@iee.org writes: diff --git a/Documentation/git.txt b/Documentation/git.txt index ca85d1d..75b35ce 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -22,11 +22,13 @@ unusually

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

2012-08-16 Thread Junio C Hamano
Miklos Vajna vmik...@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 +++

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

2012-08-16 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Thursday, August 16, 2012 5:22 PM Miklos Vajna vmik...@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

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

2012-08-16 Thread Junio C Hamano
Miklos Vajna vmik...@suse.cz writes: On Thu, Aug 16, 2012 at 09:22:14AM -0700, Junio C Hamano gits...@pobox.com 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

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

2012-08-16 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: 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? $ git help gitcli is the closest that comes to mind. If it is not reachable from git help git, we may want

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

2012-08-16 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: We would really think hard to avoid breaking when introducing new options whose long name could begin with v or q to avoid breaking -v and -q that are common across commands [today's lesson for me; do not type while eating] Sorry. We would

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

2012-08-16 Thread Junio C Hamano
Johannes Sixt j...@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

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

2012-08-16 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Thursday, August 16, 2012 9:23 PM Philip Oakley philipoak...@iee.org writes: 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? $ git help gitcli is the

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

2012-08-16 Thread Miklos Vajna
On Thu, Aug 16, 2012 at 02:09:33PM -0700, Junio C Hamano gits...@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