Rebase

git checkout feature
git rebase master

git rebase

Merge

git merge master feature

git merge

from git tutorial