Use .git/MERGE_MSG in cherry-pick/revert