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
2012-08-22 11:53:31 -07:00 · 2012-08-22 11:53:31 -07:00 · 88cec243a3
parent 210106b425 d9aa361043
commit 88cec243a3
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