Date: Tue, 28 Mar 2023 12:00:05 +0200 From: Felix Palmen <zirias@FreeBSD.org> To: freebsd-hackers@freebsd.org Subject: Re: what's the Correct git update method keeping local changes Message-ID: <20230328100005.63necvdkvx4y7zyo@nexus.home.palmen-it.de> In-Reply-To: <20230328035507.9B8632CD@slippy.cwsent.com> References: <ZCJct8nsBSABpKOL@int21h> <20230328035507.9B8632CD@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--7nkp2fbrsmgnrkf3
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
* Cy Schubert <Cy.Schubert@cschubert.com> [20230327 20:55]:
> I maintain my own branch which contains my patches. In fact I maintain a=
=20
> branch for each patch. I then do a git cherry-pick from each patch branch=
=20
> to my own branch.
+1 for just maintaining your local branch, that's the cleanest way to do
it.
Git is pretty flexible, so many variations are possible. I personally do
it the other way around, I just have two branches, "local" and "wip",
with local containing anything I want to include in my poudriere bulk
builds and "wip" containing other development stuff.
For putting something up for review, I create a new branch from "main"
and cherry-pick the relevant commits from "local" or "wip".
Updating my branches is as simple as
git checkout local
git fetch upstream main:main
git rebase main
(and similar for my "wip" branch if it currently contains something)
There, "upstream" is my remote pointing at the official ports repository
hosted on freebsd.org.
--=20
Felix Palmen <zirias@FreeBSD.org> {private} felix@palmen-it.de
-- ports committer (mentee) -- {web} http://palmen-it.de
{pgp public key} http://palmen-it.de/pub.txt
{pgp fingerprint} 6936 13D5 5BBF 4837 B212 3ACC 54AD E006 9879 F231
--7nkp2fbrsmgnrkf3
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iNUEABYKAH0WIQRpNhPVW79IN7ISOsxUreAGmHnyMQUCZCK6nl8UgAAAAAAuAChp
c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0Njkz
NjEzRDU1QkJGNDgzN0IyMTIzQUNDNTRBREUwMDY5ODc5RjIzMQAKCRBUreAGmHny
McHSAQCM3DBpvOPJVPuKAcBOsLeVC5P4KWuHbO+cC4u36G/tNAEA+KdtWhWb2iwR
kLm18iODmUiKMex5dJODNiBxg2gTqAc=
=JZFf
-----END PGP SIGNATURE-----
--7nkp2fbrsmgnrkf3--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20230328100005.63necvdkvx4y7zyo>