Date: Tue, 30 Jan 2024 20:57:10 -0800 From: Cy Schubert <Cy.Schubert@cschubert.com> To: Jessica Clarke <jrtc27@freebsd.org> Cc: Jung-uk Kim <jkim@FreeBSD.org>, "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331 Message-ID: <20240130205710.11cf19cf@slippy> In-Reply-To: <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org> References: <202401310406.40V46AUG000837@gitrepo.freebsd.org> <3BE4D4E2-DFF3-4F68-B3D3-8CE9C27089A5@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 31 Jan 2024 04:29:18 +0000 Jessica Clarke <jrtc27@freebsd.org> wrote: > On 31 Jan 2024, at 04:06, Jung-uk Kim <jkim@FreeBSD.org> wrote: > > > > The branch main has been updated by jkim: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=722b16673c40aedf280895f2f2f676bb494518d7 > > > > commit 722b16673c40aedf280895f2f2f676bb494518d7 > > Author: Jung-uk Kim <jkim@FreeBSD.org> > > AuthorDate: 2024-01-30 21:43:45 +0000 > > Commit: Jung-uk Kim <jkim@FreeBSD.org> > > CommitDate: 2024-01-31 03:16:36 +0000 > > > > acpica: Import ACPICA 20230331 > > > > (cherry picked from commit 8e013e1e3b81740266738226667431cf5c28b17a) > > Cherry-pick not merge for a vendor merge?.. Probably not Kosher but, a general git question about cherry-picks vs merges. A cherry-pick, without the -x but specifying the source branch, results in no cherry picked merge but a merge of the last commit of the source branch to the current branch. Can someone explain this? And if this would be any different from a merge from a branch that is ahead by one commit since the last merge? -- Cheers, Cy Schubert <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org NTP: <cy@nwtime.org> Web: https://nwtime.org e^(i*pi)+1=0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20240130205710.11cf19cf>