title: Fix commit history in Git
body: <p>I messed up something in my commit history now I am not able to fix it in order to make the history straight as it was (there is no merging before and I would like to keep it that way).</p>
  
  <p><img src="https://i.stack.imgur.com/MU6MT.png" alt="commit history"></p>
  
  <p>I tried to rebase it or make <code>git reset --soft HEAD</code> on last commit and the last two merged commits again but I am always forced to pull the changes before pushing the merge commit and I am again running into same issue.Thanks a lot for any tips.</p>