зеркало из https://github.com/microsoft/git.git
Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfix
* jc/maint-pull-docfix-for-409b8d82: Documentation: exclude irrelevant options from "git pull"
This commit is contained in:
Коммит
8be1d04a7e
|
@ -97,10 +97,10 @@ must be given before the options meant for 'git fetch'.
|
|||
Options related to merging
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
include::merge-options.txt[]
|
||||
|
||||
:git-pull: 1
|
||||
|
||||
include::merge-options.txt[]
|
||||
|
||||
-r::
|
||||
--rebase::
|
||||
Rebase the current branch on top of the upstream branch after
|
||||
|
|
Загрузка…
Ссылка в новой задаче