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>
index | next in thread | raw e-mail
Hi,
I am trying to MFC a commit to stable/12.
The cherry-pick works, but the resultant code
is not correct and won't build.
--> I broke the build yesterday and manually
reverted the breakage.
So, how do I do this?
Do I have to manually edit the file after the
cherry-pick and then do something like a
git commit -a
to get the edited change in, or is there a
way to tell it to add it to the cherry-pick or ??
Thanks anyone, for help with this, rick
home |
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YQXPR0101MB09681229241CAD2BD91794ADDD3B9>