Git Undo

The following takes you back to the previous commit.
$ git reset HEAD~

Then make the changes you need and re-add files.

$ git commit -c ORIG_HEAD

References

Undo a commit & redo
https://stackoverflow.com/a/927386