I used to do this, but I've started using

  git checkout master
  git diff master..featurebranch | git apply

instead.