Merge foo branch into master branch (http://lwn.net/Articles/210045/)

merge_foo_into_master.sh

# create foo branch
git checkout -b foo

# do some stuff on foo branch

# add changes and commit
git add .
git commit -m "add foo feature"

# merge foo branch into master branch
git checkout master
git pull . foo