I just commit --amend and the push -f to not waste brainpower on messages.