Today I learned how to revert the last Git commit but keep the changes:

git reset --soft HEAD ~1

Fix more common git mistakes: Include.js.

Further Reading