Re: [PATCH] man: git pull -r is a short for --rebase
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 17, 2012, 06:18 UTC
- Message-ID
- <7vk3wyvy67.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <20120817053826.GB22313@suse.cz>
Miklos Vajna <vmiklos@suse.cz> writes:
Show 10 quoted lines
> 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.
Yuck. I could say it's not our problem that others spread something we didn't document ;-) but I am too nice to say that.
Let's do this, then, but you have to sign off your patch.
Thanks for investigating.
-- >8 -- From: Miklos Vajna <vmiklos@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 "-r" was an unintended accident and was not even documented, but the short option seems to be already used in the wild. Let's document it so that other options that begin with "r" would not be tempted to steal it. --- Documentation/git-pull.txt | 1 + 1 file changed, 1 insertion(+)
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
-- 1.7.12.rc3.2.gbd120e3