Git: getting changes from another branch

git checkout featurebranch && git rebase master

As long as you haven’t pushed yet, it is better to replay your changes on top of master.

See:

• git rebase vs. merge
• git workflow and rebase vs merge questions