git blame and cherry-picking

What, if any, is the approved way to get git blame to follow cherry- picked changes? Right now blame is good about showing you the actual responsible revision and author in the case of merges, but if you cherry-pick a change with "-n" (to test before committing), the modifications are attributed to the person who did the cherry-pick instead of the cherry-picked revision's author. Even without the "-n" option, the changes are attributed to the cherry-pick *revision* instead of the original one.

My horrible hack workaround for now is to temporarily put a grafts entry in place to make git think the cherry-pick revisions I'm interested in are actually merges. That requires me to know that a given revision is a cherry-pick and I have to be careful to remove my fake graft afterwards. What's more, it can result in some strange and seemingly nonsensical "merge" topologies if, e.g., a newer change is cherry-picked before an older one.

Surely there must be a better way...?

-Steve