Date: Thu, 17 Dec 2020 11:44:27 -0700 From: Warner Losh <imp@bsdimp.com> To: bob prohaska <fbsd@www.zefox.net> Cc: "freebsd-arm@freebsd.org" <freebsd-arm@freebsd.org> Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend Message-ID: <CANCZdfrS4%2BAMgrYig4XSjMZDkTQnKM_zwP978GPMK-UUrStK0Q@mail.gmail.com> In-Reply-To: <20201217173836.GA31318@www.zefox.net> References: <CANCZdfrUsaw5jpN1ybpk0ADXdQYam0_NO0mPJd0-FMbuxPruhw@mail.gmail.com> <20201217173836.GA31318@www.zefox.net>
index | next in thread | previous in thread | raw e-mail
On Thu, Dec 17, 2020 at 10:38 AM bob prohaska <fbsd@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. Warnerhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfrS4%2BAMgrYig4XSjMZDkTQnKM_zwP978GPMK-UUrStK0Q>