Manual rebasing of a feature branch, including update of origin.

git-manual-rebase.md

Checkout the feature branch that needs rebasing:

$ git checkout feature/blah

Then rebase onto develop:

$ git rebase develop

Then force upstream feature branch to match local one:

$ git checkout develop
$ git push --force -u origin feature/blah