Merge branch 'mv/pull-r-for-rebase'

A minor documentation update.

* mv/pull-r-for-rebase:
  man: git pull -r is a short for --rebase
This commit is contained in:
Junio C Hamano 2012-08-22 11:53:31 -07:00
commit 88cec243a3

View File

@ -101,6 +101,7 @@ include::merge-options.txt[]
:git-pull: 1 :git-pull: 1
-r::
--rebase:: --rebase::
Rebase the current branch on top of the upstream branch after Rebase the current branch on top of the upstream branch after
fetching. If there is a remote-tracking branch corresponding to fetching. If there is a remote-tracking branch corresponding to