Date: Fri, 4 Jun 2021 02:11:41 +0000 From: Rick Macklem <rmacklem@uoguelph.ca> To: FreeBSD Current <freebsd-current@freebsd.org> Subject: git MFC/cherry-pick question Message-ID: <YQXPR0101MB09681229241CAD2BD91794ADDD3B9@YQXPR0101MB0968.CANPRD01.PROD.OUTLOOK.COM>
next in thread | raw e-mail | index | archive | help
Hi,=0A=
=0A=
I am trying to MFC a commit to stable/12.=0A=
The cherry-pick works, but the resultant code=0A=
is not correct and won't build.=0A=
--> I broke the build yesterday and manually=0A=
reverted the breakage.=0A=
=0A=
So, how do I do this?=0A=
=0A=
Do I have to manually edit the file after the=0A=
cherry-pick and then do something like a=0A=
git commit -a=0A=
to get the edited change in, or is there a=0A=
way to tell it to add it to the cherry-pick or ??=0A=
=0A=
Thanks anyone, for help with this, rick=0A=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YQXPR0101MB09681229241CAD2BD91794ADDD3B9>