For combining more than 2-3 commits prior to pushing, in cases where you only want to end up with one commit, I find `git fetch; git reset --soft origin/master;

For combining more than 2-3 commits prior to pushing, in cases where you only want to end up with one commit, I find `git fetch; git reset --soft origin/master; git commit` to be quicker than interactive rebase.