URL for stable/13
Warner Losh
imp at bsdimp.com
Wed Mar 3 00:22:24 UTC 2021
On Tue, Mar 2, 2021 at 10:46 AM bob prohaska <fbsd at www.zefox.net> wrote:
> On Tue, Mar 02, 2021 at 09:46:11AM -0700, Warner Losh wrote:
> > On Tue, Mar 2, 2021 at 9:18 AM bob prohaska <fbsd at www.zefox.net> wrote:
> >
> > > A while back I obtained a buildable source tree for stable/13
> > > but it hasn't been updated in the last few days. Running
> >
> > It would help if you asked a question.
> >
>
> Apparently I didn't understand the correct question to ask.
> 8-)
>
> When set up I configured git to use -ff only and simply used
> git pull . to update, which seemed to work until a few days ago.
>
>
> > If you'd like to know how to update now that you have this tree, I'd
> > suggest 'git pull --rebase' or 'git pull --ff-only'
> >
>
> Now it seems an explicit git pull --ff-only is required.
> It just pulled down a substantial crop of updates. Now
> to see if buildworld succeeds.... That'll take a while.
>
git config merge.ff only
Toss a '--global' in there after the 'config' for all repos.
Warner
> > If it's some other question, I'm happy to help with that.
> >
>
> You already have, and I didn't even ask the right question...
>
> Thank you!
> bob prohaska
>
>
>
More information about the freebsd-current
mailing list