git commit --amend This Fixes #4, it also resolves #3, and fixes #1