Git: Rebasing a Branch onto Master

1. Checkout your feature branch you want 'merged' into master.

$ git checkout feature

2. Rebase master onto the feature branch.

$ git rebase master

3. Then rebase your feature onto the master branch.

$ git checkout master
$ git rebase feature

4. Check you have the lastest changes from origin, then push

$ git pull
$ git push