title: Reset without losing already committed files
body: <p>When I accidentally committed a file to the wrong branch, I normally use <code>git reset --hard HEAD~1</code>. However, using this method I generally lose all the files committed. Is there a way to reset a commit, without losing the edited files?</p>