Re: HEADS UP: FreeBSD src repo transitioning to git this weekend

Hi bob,

The safe solution is

    git config pull.ff only

This prompts you to manually deal with local changes in the tree.
The other two options create a merge commit (merge) or rebase your
local changes on top of the remote updates (rebase) on pull.  In
no case will a pull action push anything back to the remote
repository.

Yours,
Robert Clausecker

On Thu, Dec 17, 2020 at 09:38:36AM -0800, bob prohaska 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!
> 
> bob prohaska
> 
> _______________________________________________
> [email protected] mailing list
> https://lists.freebsd.org/mailman/listinfo/freebsd-arm
> To unsubscribe, send any mail to "[email protected]"

-- 
()  ascii ribbon campaign - for an 8-bit clean world 
/\  - against html email  - against proprietary attachments
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-arm
To unsubscribe, send any mail to "[email protected]"