Instead of a git master rebase, you might want to look at the git rebase branch to master operation instead. This allows you to squash Git commits and manipulate the history of branches that interact ...