After unsuccessfully trying to change the author of a commit, I ended up with the following situation in my git repo (local and remote). I am the only developer using this so ch