mirror of
https://github.com/git/git.git
synced 2024-10-20 14:39:10 +02:00
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
This commit is contained in:
commit
1103996ea4
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user