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
2012-08-24 12:05:47 -07:00 · 2012-08-24 12:05:47 -07:00 · 1103996ea4
parent bdb30339f6 d9aa361043
commit 1103996ea4
1 changed files with 1 additions and 0 deletions
--- 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