Re: Upgrading from old version (13.0-RELEASE-p4)

From: Kevin Oberman <rkoberman_at_gmail.com>
Date: Mon, 25 Sep 2023 05:37:14 UTC 
On Sat, Sep 23, 2023 at 9:05 AM Graham Perrin <grahamperrin@gmail.com>
wrote:

> On 22/09/2023 00:54, Eduardo Lemos de Sa wrote:
> > 6) …
> >
> > For future upgrades, I suggest:
> > cd /usr/src
> > git pull
> > followed by steps 4, 5, and so on...
> >
> > …
> >
> I'd use --ff-only for the pull.
>

The git documentation for the pull command claims that --ff-only is the
default. Is that incorrect? From "man git-pull":
      --ff-only
           Only update to the new history if there is no divergent local
           history. This is the default when no method for reconciling
           divergent histories is provided (via the --rebase=* flags).
-- 
Kevin Oberman, Part time kid herder and retired Network Engineer
E-mail: rkoberman@gmail.com
PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683