One of the great features of git is the ability to re-order commits, break
commits into parts, and merge commits together.
Assuming that my master branch is a pristine copy of the site and an ancestor of
mybranch we can re-order commits by running:
git rebase -i master