How would I "rollback" the last commit in git without deleting any changes?
This is something I've done often in hg:
With git you may actually prefer to use the
--amend option in that case.
git commit --amendand edit the notes
If you need to rollback for other reasons take a look at