зеркало из https://github.com/microsoft/git.git
Merge branch 'pb/pull-fetch-doc'
The more aggressive updates to remote-tracking branches we had for the past 7 years or so were not reflected in the documentation, which has been corrected. * pb/pull-fetch-doc: pull doc: correct outdated description of an example pull doc: refer to a specific section in 'fetch' doc
This commit is contained in:
Коммит
fdee8b170d
|
@ -229,9 +229,9 @@ branch.<name>.merge options; see linkgit:git-config[1] for details.
|
|||
$ git pull origin next
|
||||
------------------------------------------------
|
||||
+
|
||||
This leaves a copy of `next` temporarily in FETCH_HEAD, but
|
||||
does not update any remote-tracking branches. Using remote-tracking
|
||||
branches, the same can be done by invoking fetch and merge:
|
||||
This leaves a copy of `next` temporarily in FETCH_HEAD, and
|
||||
updates the remote-tracking branch `origin/next`.
|
||||
The same can be done by invoking fetch and merge:
|
||||
+
|
||||
------------------------------------------------
|
||||
$ git fetch origin
|
||||
|
|
|
@ -19,7 +19,8 @@ ifndef::git-pull[]
|
|||
(see <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> below).
|
||||
endif::git-pull[]
|
||||
ifdef::git-pull[]
|
||||
(see linkgit:git-fetch[1]).
|
||||
(see the section "CONFIGURED REMOTE-TRACKING BRANCHES"
|
||||
in linkgit:git-fetch[1]).
|
||||
endif::git-pull[]
|
||||
+
|
||||
The format of a <refspec> parameter is an optional plus
|
||||
|
|
Загрузка…
Ссылка в новой задаче