Skip to content

Commit fdee8b1

Browse files
committed
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
2 parents fc3f6fd + a440884 commit fdee8b1

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Documentation/git-pull.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,9 @@ branch.<name>.merge options; see linkgit:git-config[1] for details.
229229
$ git pull origin next
230230
------------------------------------------------
231231
+
232-
This leaves a copy of `next` temporarily in FETCH_HEAD, but
233-
does not update any remote-tracking branches. Using remote-tracking
234-
branches, the same can be done by invoking fetch and merge:
232+
This leaves a copy of `next` temporarily in FETCH_HEAD, and
233+
updates the remote-tracking branch `origin/next`.
234+
The same can be done by invoking fetch and merge:
235235
+
236236
------------------------------------------------
237237
$ git fetch origin

Documentation/pull-fetch-param.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ ifndef::git-pull[]
1919
(see <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> below).
2020
endif::git-pull[]
2121
ifdef::git-pull[]
22-
(see linkgit:git-fetch[1]).
22+
(see the section "CONFIGURED REMOTE-TRACKING BRANCHES"
23+
in linkgit:git-fetch[1]).
2324
endif::git-pull[]
2425
+
2526
The format of a <refspec> parameter is an optional plus

0 commit comments

Comments
 (0)