> On Aug 21, 2025, at 9:40 AM, Cy Schubert <[email protected]> wrote: > > In message <[email protected]>, Cy Schubert writes:
…
> I used the vendor branch commit hash. As with git-diff the files are rooted
> from contrib/krb5 not from the root of the source tree. This must be a
> subtree merge thing.
I’ve been using `git subtree merge -P` as of late when doing vendor
imports. git merge/git cherry-pick don’t do the right thing when I run those
commands.
Cheers,
-Enji
signature.asc
Description: Message signed with OpenPGP
