Am 04.01.2018 um 10:46 schrieb Catonano:
> This is a little bit annoying, as I can't rebase my branch on master
> in order to edit the commit message without dealing with those too
> (stashing or checking them out back to where they were)

Try this:

git checkout po