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. Signed-off-by: Miklos Vajna <vmiklos@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Miklos Vajna committed
Aug 16, 2012 at 11:50 UTC
d9aa3610437e8cfab86fe3d1e3433400de15773d
1 file changed
+1
Documentation/git-pull.txt
+1
@@ -101,6 +101,7 @@ include::merge-options.txt[]
101
102
:git-pull: 1
103
104
+-r::
105
--rebase::
106
Rebase the current branch on top of the upstream branch after
107
fetching. If there is a remote-tracking branch corresponding to