From: Miklos Vajna Date: Thu, 16 Aug 2012 09:50:18 +0000 (+0200) Subject: man: git pull -r is a short for --rebase X-Git-Tag: v1.7.11.6~25^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9aa3610437e8cfab86fe3d1e3433400de15773d;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index defb544ed..67fa5ee19 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