Michael DeHaan wrote:
> Jasper Capel wrote:
>
>>
https://bender.newnewyork.nl/git/gitweb.cgi?p=cobbler/.git;a=commit;h=64e...
>>
> Applied to devel and master branches, thanks.
>
> Apparently git is a little annoyed with trying to cherry-pick external
> content, so if you really want to, you can cherry-pick your own commits
> between your master and devel branches,
> then I could just do a couple of merges.
>
> Not important though, it's settled :)
>
>
IIRC, you can setup Jasper's repo as a remote using git remote add
jasper <url>, and then git fetch jasper <branch>, which will not apply
the changes, just fetch the remote data.
Then, cherry-picking the commit should be easy (since the refspec
actually exists in the local tree).
Yeah, I already do this. All it is is you can't cherry-pick merge
commits because they contain no content -- you have to cherry-pick the
actual commits.