mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-20 09:59:05 +02:00
Code

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

Browse Source 
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-24 12:05:47 -07:00
commit 1103996ea4
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/git-pull.txt
View File

@ -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