From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 2AD181F5AD for ; Mon, 6 Apr 2020 20:22:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726130AbgDFUWi (ORCPT ); Mon, 6 Apr 2020 16:22:38 -0400 Received: from cloud.peff.net ([104.130.231.41]:34942 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1725933AbgDFUWi (ORCPT ); Mon, 6 Apr 2020 16:22:38 -0400 Received: (qmail 27100 invoked by uid 109); 6 Apr 2020 20:22:37 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with SMTP; Mon, 06 Apr 2020 20:22:37 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 17478 invoked by uid 111); 6 Apr 2020 20:32:59 -0000 Received: from coredump.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.2) by peff.net (qpsmtpd/0.94) with (TLS_AES_256_GCM_SHA384 encrypted) ESMTPS; Mon, 06 Apr 2020 16:32:59 -0400 Authentication-Results: peff.net; auth=none Date: Mon, 6 Apr 2020 16:22:36 -0400 From: Jeff King To: Philippe Blain via GitGitGadget Cc: git@vger.kernel.org, Marc Branchaud , Clemens Buchacher , Philippe Blain Subject: Re: [PATCH 2/2] pull doc: correct outdated description of an example Message-ID: <20200406202236.GB1245278@coredump.intra.peff.net> References: <46365925d22d31feae7618614dd7872a19bebeef.1586101819.git.gitgitgadget@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <46365925d22d31feae7618614dd7872a19bebeef.1586101819.git.gitgitgadget@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Sun, Apr 05, 2020 at 03:50:19PM +0000, Philippe Blain via GitGitGadget wrote: > From: Philippe Blain > > Since f269048754 (fetch: opportunistically update tracking refs, > 2013-05-11), the underlying `git fetch` in `git pull ` > updates the configured remote-tracking branch for . > > 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