[mark_story]

For the extra lazy, you can use git aliases to make `git amend` or `git ca`.