title: Reverting to a specific sha or commit
body: <p>I'm trying to revert to a specific commit ( 3d5575f8e4c97ddab8ad5d540fee4664c04db75d ), but when i do:</p>
  
  <pre><code>git revert 3d5575f8e4c97ddab8ad5d540fee4664c04db75d
  </code></pre>
  
  <p>it says:</p>
  
  <pre><code>fatal: 'revert' is not possible because you have unmerged files.
  Please, fix them up in the work tree, and then use 'git add/rm &lt;file&gt;' as
  appropriate to mark resolution and make a commit, or use 'git commit -a'.
  </code></pre>
  
  <p>I don't care those changes, and I also <em>want</em> to lose those changes, revert to that commit (soft revert, dont want to lose the files) THEN repull down changes. My local stuff is all messed up. Any help?</p>