rebase is dead long live the squabaserge

Git commit history is another form of documentation and it should be treated as such! It's such a useful tool as a developer to understand the history of how and why you're codebase changed. Use git rebase for a cleaner git history.