Some tips for using git rebase and keeping your history clean