path: root/Documentation/git-pull.txt
diff options
authorMiklos Vajna <>2012-08-16 09:50:18 (GMT)
committerJunio C Hamano <>2012-08-17 07:26:52 (GMT)
commitd9aa3610437e8cfab86fe3d1e3433400de15773d (patch)
tree032247e7dc548244503f4b6dab8b5d5eb29c3a00 /Documentation/git-pull.txt
parent785ee4960c3d334cbc2b17ab74d2cebdf1b4db64 (diff)
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 <>
Diffstat (limited to 'Documentation/git-pull.txt')
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
Rebase the current branch on top of the upstream branch after
fetching. If there is a remote-tracking branch corresponding to