title: In Git, how can I recover a staged file that was reverted prior to committing?
body: <p>I was attempting to pull a change into my repository using Git Tower. When I did so, there was a conflict and I mistakenly hit stage all (as I wanted to commit after resolving the conflict).  When I did so, the conflict marked itself as resolved.</p>
  
  <p>I wanted to manually resolve the change so I hit "Abort Merge", however, when I did this, It rolled back all my changes! Is there any way to get them back?</p>