# create and checkout the feature
git checkout -b greatfeaturebranch
# implement the cool feature 1
git commit -m "Cool feature 1"
# implement the cool feature 2
git commit -m "Cool feature 2"
# Switch back to the master branch
git checkout master
git merge greatfeaturebranch
# optionally- delete the branch
git branch -d greatfeaturebranch