Be careful not to rewrite history you have already pushed.

I always use

  git rebase --interactive origin/master

That only shows me commits that are local.