Or you could cherry-pick the fix. When you update git pull --rebase will automatically drop it when you rebase past that spot. Or if you have a branch, you can do the same to the branch and when you rebase past the fix, it will automatically drop.
Warner On Thu, Jul 7, 2022 at 9:25 AM Ryan Stone <ryst...@gmail.com> wrote: > You could "git cherry-pick -n 37f604b49d4a; git restore --unstaged > sys/net/vnet.h" to apply the fix to your local tree without committing > it or leaving it staged for commit. > > On Thu, Jul 7, 2022 at 10:50 AM Steve Kargl > <s...@troutmask.apl.washington.edu> wrote: > > > > On Thu, Jul 07, 2022 at 10:38:43AM -0400, Ryan Stone wrote: > > > Okay, update your tree and it should be fixed then. > > > > Is it possible to pull just that fix? I spent part of > > yesterday building world, and contrary to popular belief, > > not all hardware contain a 32-core uber-fast ryzen cpu. > > > > Can people please test their simple changes prior to > > committing? > > > > -- > > Steve > >
