> On Jul 4, 2026, at 2:48 PM, Rick Macklem <[email protected]> wrote: > > On Sat, Jul 4, 2026 at 2:19 PM Warner Losh <[email protected] > <mailto:[email protected]>> wrote: >> >> >> On Sat, Jul 4, 2026 at 3:16 PM Rick Macklem <[email protected]> wrote: >>> >>> Hi, >>> >>> I now have a rather large # of commits authored by Vinicius Ferrao >>> for NFS-over-RDMA. They are currently in his fork of freebsd-src >>> on github.com. >>> >>> I do have a simpleton mechanism to get them into a local branch >>> of main, but I do not want to push them to main yet. >>> (Actually, I'd be happy to push them into main, but I have as yet, >>> no way of testing them.) >>> >>> Is there somewhere I can push this stuff so others can clone it? >>> (I can push it to a fork I have of freebsd-src on github.com, but >>> I don't know how to push that to "main"?) >>> >>> I'm git clueless, so any suggestions would be appreciated, rick >> >> >> So usually what people do is to create some named branch (nfs-over-rdma). >> They then push that to a fork of FreeBSD they've setup on their github. >> They then point people at that branch for testing and collaboration. We don't >> currently allow WIP branches to be pushed either to our source of truth repo >> or our github mirror. > Ok, I know how to do the above. What I don't know how to do is get that into > main? (When you say "named branch" is that a branch of a github fork > of freebsd-src > or a named branch of my local clone of main? If it is the latter, I > can see how I can > push it when the time comes, but can I push that to my fork on github?) > > Thanks for any help, rick
`git cherry-pick -x`, replaying the commits is one way.. but as long as the base revision is constant between GitHub:main and FreeBSD:main and the exporter is not goofing up the hashes (it hasn’t AFAIK), you can just push the changes to GitHub, then rebase them on FreeBSD:main. If you’d like a diagram/short writeup with a flow diagram, I can do that. I’m done that a few times using Markdown and other graph render formats. Cheers, -Enji
