title: How can I remove my last commit in my local git repository
body: <p>When I do a 'git pull', I have conflict with the head commit. So I did a 'git rebase --abort'</p>
  
  <p>Can I 'save' my commit to a "patch" and then do a git pull?</p>
  
  <p>What I want to emulate is:</p>
  
  <ul>
  <li>I did not commit, but I did a 'git stash' instead</li>
  <li>Do a git pull to avoid any merge error</li>
  </ul>
  
  <p>So I need somehow to 'turn back the clock'. Is that possible with git?</p>