Sign up to request clarification or add additional context in comments.
Comments
1
One way is to do git stash --keep-index. Now your local file will be identical to what is staged in the index. To get your other changes back from the stash do git stash pop or git stash apply.