Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11

A minor documentation update. * mv/pull-r-for-rebase: man: git pull -r is a short for --rebase
git-mirror · Aug 24, 2012 · 1103996 · 1103996
2 parents bdb3033 + d9aa361
commit 1103996
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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