Git - Merge last branch into master

> git checkout -b new_feature
// do stuff
> git commit -am "done"
> git checkout master
> git merge -