When I accidentally committed a file to the wrong branch, I normally use git reset --hard HEAD~1. However, using this method I generally lose all the files committed. Is there a way to reset a commit, without losing the edited files?
Reset without losing already committed files
Viewed 21868
3 Answers
for my case, i prefer using --mixed instead, after i found this simple explanation
git reset --mixed HEAD^
Related