cherry-pick --message?

Hi all,

I have an slightly unusual usecase for cherry-pick: I want to modify the commit message that is used in the process, e.g. do an d/^PROP:/ on it, but unfortunately -m does something else here.

And there is no --message here for good reason, as cherry-pick can pick multiple commits and so on. Bad for me, though.

So, am I down to the combo of format-patch and apply, or is there an easier way? (I'd also like to end up in the same state as with cherry-pick should there be conflicts.)

- Andreas