For what it's worth, this is how I rebase, and it works pretty well for me.

$ git checkout master
$ git pull --rebase upstream master
$ git checkout feature-branch
$ git rebase master

This keeps my master updated from upstream, and allows me to just rebase my feature branches from my local master.