HEADS UP: FreeBSD src repo transitioning to git this weekend

[Warner Losh]

On Thu, Dec 17, 2020 at 10:38 AM bob prohaska <fbsd at www.zefox.net> wrote:

>
> On Wed, Dec 16, 2020 at 05:46:35PM -0700, Warner Losh wrote:
> > The FreeBSD project will be moving it's source repo from subversion to
> git
> > starting this this weekend. The docs repo was moved 2 weeks ago. The
> ports
> > repo will move at the end of March, 2021 due to timing issues.
> >
>
> Which of
>   git config pull.rebase false  # merge (the default strategy)
>   git config pull.rebase true   # rebase
>   git config pull.ff only       # fast-forward only
> is most appropriate for a test-only source tree? It would be
> nice to preserve local changes, but nothing will ever get put
> (pushed?) back to the repository.
>
> Apologies if the answer is in front of my nose!
>

'git config pull.ff only ' is the safest for that scenario. It will ensure
that you don't accidentally wind up with a polluted stream. You'll know
your local copy is always the same as upstream.

It's how I run in and I *DO* have things to push. When I have stuff in main
and hit a collision between putting it there and pushing, I do a git pull
--rebase, but that has some issues with merge commits, but since merge
commits are confined to vendor branch support, that's usually OK for me.

Warner