During a 'rebase -i', I often find myself grabbing the patch being applied from .git/rebase-merge/patch. I wouldn't need to do this if I could run 'git diff CHERRY_PICK_HEAD^!'.