Date: Sun, 24 Sep 2023 22:37:14 -0700 From: Kevin Oberman <rkoberman@gmail.com> To: Graham Perrin <grahamperrin@gmail.com> Cc: questions@freebsd.org Subject: Re: Upgrading from old version (13.0-RELEASE-p4) Message-ID: <CAN6yY1t7kMLY7u1GW71c7j6pGscUOrad6M5Xz%2BoF3_=bsZpNOw@mail.gmail.com> In-Reply-To: <9d5bde87-ff01-71a1-7b48-992545c3099e@gmail.com> References: <73cf476a-d113-f724-8a35-bc6ee6fc88be@Julf.com> <CA%2BnjGkutWREK8MgSmOS%2Bj=4QMmU9jQHrEZgzVr1cMOueN6CkAg@mail.gmail.com> <9d5bde87-ff01-71a1-7b48-992545c3099e@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
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
[-- Attachment #2 --]
<div dir="ltr"><div dir="ltr"><div class="gmail_default" style="font-family:tahoma,sans-serif;font-size:small">On Sat, Sep 23, 2023 at 9:05 AM Graham Perrin <<a href="mailto:grahamperrin@gmail.com">grahamperrin@gmail.com</a>> wrote:</div></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On 22/09/2023 00:54, Eduardo Lemos de Sa wrote:<br>
> 6) …<br>
><br>
> For future upgrades, I suggest:<br>
> cd /usr/src<br>
> git pull<br>
> followed by steps 4, 5, and so on...<br>
><br>
> …<br>
><br>
I'd use --ff-only for the pull.<br></blockquote><div><br></div><div style="font-family:tahoma,sans-serif;font-size:small" class="gmail_default">The git documentation for the pull command claims that --ff-only is the default. Is that incorrect? From "man git-pull":<br></div><div style="font-family:tahoma,sans-serif;font-size:small" class="gmail_default"> --ff-only<br> Only update to the new history if there is no divergent local<br> history. This is the default when no method for reconciling<br> divergent histories is provided (via the --rebase=* flags).<br></div></div><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr">Kevin Oberman, Part time kid herder and retired Network Engineer<br>E-mail: <a href="mailto:rkoberman@gmail.com" target="_blank">rkoberman@gmail.com</a><br></div><div>PGP Fingerprint: D03FB98AFA78E3B78C1694B318AB39EF1B055683</div></div></div></div></div></div></div></div></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAN6yY1t7kMLY7u1GW71c7j6pGscUOrad6M5Xz%2BoF3_=bsZpNOw>