Sometimes you recognize that your change history is a bit of a mess. One commit contains multiple different types of changes, possibly even some refactoring.

In this post I describe my (current) workflow to handle that. Git being git, this might not be the only one, possibly not even the best way to do it!

First you need to know which commit is affected.

Last commit

If you happen to remember that the disastrous commit was the one you just did, you are in luck, as the process is quite easy.