$ foo --help: June 2015

You made a commit which has files that should not have been there. Worry not!

git reset --soft HEAD~1   // to soft reset (preserve changes)

git reset HEAD  /files/you/wish/to/unstage

You can now commit the staged files and checkout the unstaged files

git commit  

git checkout /files/you/wish/to/checkout

That's it!

Emacs keyboard macros are fun to use.

C-x ( to start recording

C-x ) to stop recording

C-x e to execute

If you want to repeat the macro N number of times,

C-u N C-x e