title: Recovering a git reset --soft
body: <p>I modified some files in my branch and did a </p>
  
  <pre><code>git add --all
  </code></pre>
  
  <p>But this added some files that I didn't intend to add for the commit.</p>
  
  <p>So I did a </p>
  
  <pre><code>git reset --soft HEAD~2 (instead of doing git reset HEAD)
  </code></pre>
  
  <p>But the previous commit was made by someone else and it caused a lot of files to be in modified/added/deleted status. Is there a way to get back to a stage where the only changes I see are the files added/modified by me? Since I didnt make an actual commit, is there a way to move my head back to master without blowing away my changes? git pull is causing merge conflicts as I didn't actually commit my changes.</p>
  
  <p>Thanks!</p>