I think git subtree seems like the most sane solution here, the ability to split out updates to the subtree back upstream makes them just as useful as submodule

I think git subtree seems like the most sane solution here, the ability to split out updates to the subtree back upstream makes them just as useful as submodules without all the pain.