We can all agree that Git is ridiculous [1]; however, I did just git cherry-pick a commit from one repo into a related, but separate, repo. That's pretty neat.
1. checkoway.net/musings/git/
Conversation
The cherry-pick implementation is much better at coping with files that were moved around or changed. It has a nicer UI for dealing with the conflicts too. Sometimes I end up applying a patch series with git-am to an older revision and then cherry-picking it over to stay sane.