diff options
| author | Philippe Blain <levraiphilippeblain@gmail.com> | 2020-04-05 15:50:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-05 22:00:04 (GMT) |
| commit | a44088435c37ccf91920ab18076db888cff1fc76 (patch) | |
| tree | 425aeb47896b230bbc0b42ebecae81b98cfbcfe4 /Documentation | |
| parent | f6a65de6214e48812cb245975cdb75e5649992b3 (diff) | |
| download | git-a44088435c37ccf91920ab18076db888cff1fc76.zip git-a44088435c37ccf91920ab18076db888cff1fc76.tar.gz git-a44088435c37ccf91920ab18076db888cff1fc76.tar.bz2 | |
pull doc: correct outdated description of an example
Since f269048754 (fetch: opportunistically update tracking refs,
2013-05-11), the underlying `git fetch` in `git pull <remote> <branch>`
updates the configured remote-tracking branch for <branch>.
However, an example in the 'Examples' section of the `git pull`
documentation still states that this is not the case.
Correct the description of this example.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -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 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 |