title: How to choose between options of Git reset
body: <p>I am working on a project with a partner and we use Git and Gitlab for version control. With his last commit he made some changes to the code and it does not work properly now. I wanted to revert to the version before his commit and I am given 4 options which I do not understand. I assume I should use the first or second option but I do not understand which code they refer by &quot;staged for commit&quot; - my code, his code, both?<a href="https://i.stack.imgur.com/UjJdk.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/UjJdk.png" alt="enter image description here" /></a> The thing is I had code that I stashed, then unstashed after the pull and do not want to lose.</p>