git reset --soft HEAD^
This will reset your index to HEAD^ (the previous commit) but leave your changes in the staging area.
There are some handy diagrams in the git-reset docs
If you are on Windows you might need to use this format:
git reset --soft HEAD~1