> Then before I push, I have to temporarily rewind the branch to remove them, push, then cherry-pick them again. You do not necessarily need to modify and rest

> Then before I push, I have to temporarily rewind the branch to remove them, push, then cherry-pick them again. You do not necessarily need to modify and restore your branch head just to push in this case. If you have e.g. two temporary commits at the top of the branch, you can use e.g. "git push origin HEAD~2:master" to skip those commits when pushing.