Date: Sat, 26 Dec 2020 18:31:49 +0000 From: Steve O'Hara-Smith <steve@sohara.org> To: Tim Daneliuk <tundra@tundraware.com> Cc: FreeBSD Mailing List <freebsd-questions@freebsd.org> Subject: Re: Where can I find the new git repository? Message-ID: <20201226183149.5499b18c326cfd1d4cd4232f@sohara.org> In-Reply-To: <8cce7a4e-1173-5dcb-4ccd-5c379c1a0f83@tundraware.com> References: <CADnZ6B=kwXjRMcg-vvunBN5Gms4dvK2XsO4E2qe_vWTXB%2B64Ew@mail.gmail.com> <5fe5917a.1c69fb81.b9a27.9006SMTPIN_ADDED_MISSING@mx.google.com> <CADnZ6Bm5Zt1ioyC_n=XciYOXY_uGfJtqLbiniAd-JtLM2PfEOA@mail.gmail.com> <8b1fbcaa-2e09-d2e4-03eb-1bbffcada788@yuripv.dev> <X%2BXmU5ChmB2Q7R%2BN@c720-r368166.fritz.box> <CADnZ6B=KRKMUxFk=wTtuHBDiLfU6Y_dGUE9d-RVQc=gXHPX7Pg@mail.gmail.com> <X%2BXvmFpGdw9iReU%2B@c720-r368166.fritz.box> <CADnZ6BnzcDGOx2OeekSONV3__8OUp8zg1Vg2ZtZPEsJRfxUWdw@mail.gmail.com> <X%2BcX6egJSEHI2u1c@c720-r368166.fritz.box> <20201226113259.84b4389effd0ee1f05433e62@sohara.org> <8cce7a4e-1173-5dcb-4ccd-5c379c1a0f83@tundraware.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 26 Dec 2020 10:52:10 -0600 Tim Daneliuk <tundra@tundraware.com> wrote: > On 12/26/20 5:32 AM, Steve O'Hara-Smith wrote: > > To collect changes from upstream use git fetch to fetch them > > and integrate them into your local branch use git pull (which combines a > > fetch and merge into your local repository). > > As a general matter, I do this: > > git pull --rebase > > That way any local changes I have committed will get laid down on top > of the remote master code. Yep that's the best way if you have local changes to remote branches, I prefer to use separate branches for local changes using the local copy of the remote branch as the upstream of the working branches. -- Steve O'Hara-Smith <steve@sohara.org>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20201226183149.5499b18c326cfd1d4cd4232f>