From: Jeff King <peff@peff.net>
To: Philippe Blain via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Marc Branchaud <marcnarc@xiplink.com>,
Clemens Buchacher <drizzd@gmx.net>,
Philippe Blain <levraiphilippeblain@gmail.com>
Subject: Re: [PATCH 2/2] pull doc: correct outdated description of an example
Date: Mon, 6 Apr 2020 16:22:36 -0400 [thread overview]
Message-ID: <20200406202236.GB1245278@coredump.intra.peff.net> (raw)
In-Reply-To: <46365925d22d31feae7618614dd7872a19bebeef.1586101819.git.gitgitgadget@gmail.com>
On Sun, Apr 05, 2020 at 03:50:19PM +0000, Philippe Blain via GitGitGadget wrote:
> From: Philippe Blain <levraiphilippeblain@gmail.com>
>
> 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.
Yeah, I think the example just never got updated. Your patch looks good.
Another option would be to use a direct URL rather than a configured
remote, which really would just update FETCH_HEAD. But I don't think the
handling of remote-tracking branches is central to this example either
way, so your minimal change is better.
-Peff
prev parent reply other threads:[~2020-04-06 20:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-05 15:50 [PATCH 0/2] git-pull.txt: correct outdated example + link to specific 'git fetch' section Philippe Blain via GitGitGadget
2020-04-05 15:50 ` [PATCH 1/2] pull doc: refer to a specific section in 'fetch' doc Philippe Blain via GitGitGadget
2020-04-06 20:19 ` Jeff King
2020-04-16 12:39 ` Philippe Blain
2020-04-05 15:50 ` [PATCH 2/2] pull doc: correct outdated description of an example Philippe Blain via GitGitGadget
2020-04-06 20:22 ` Jeff King [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200406202236.GB1245278@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=drizzd@gmx.net \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=levraiphilippeblain@gmail.com \
--cc=marcnarc@xiplink.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).