diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:53 -0700 |
| commit | fdee8b170d42d3502aa461208436102cf68a95f8 (patch) | |
| tree | 2815a1eaf4a6c21b9f415cb490d0dc816dd92076 /Documentation/git-pull.txt | |
| parent | Merge branch 'dd/no-gpg-sign' (diff) | |
| parent | pull doc: correct outdated description of an example (diff) | |
| download | tgif-fdee8b170d42d3502aa461208436102cf68a95f8.tar.xz | |
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/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index dfb901f8b8..21e10905fa 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 |