diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-22 20:42:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 20:42:53 (GMT) |
| commit | fdee8b170d42d3502aa461208436102cf68a95f8 (patch) | |
| tree | 2815a1eaf4a6c21b9f415cb490d0dc816dd92076 /Documentation | |
| parent | fc3f6fd7bef30895b3f80c1f8a708f5eeb69695b (diff) | |
| parent | a44088435c37ccf91920ab18076db888cff1fc76 (diff) | |
| download | git-fdee8b170d42d3502aa461208436102cf68a95f8.zip git-fdee8b170d42d3502aa461208436102cf68a95f8.tar.gz git-fdee8b170d42d3502aa461208436102cf68a95f8.tar.bz2 | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-pull.txt | 6 | ||||
| -rw-r--r-- | Documentation/pull-fetch-param.txt | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index dfb901f..21e1090 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -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 diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt index 7d3a60f..95ea849 100644 --- a/Documentation/pull-fetch-param.txt +++ b/Documentation/pull-fetch-param.txt @@ -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 |