Merge changes after a pull request

gistfile1.sh

#
# Get Jeremy's changes into a local branch:
#
git checkout -b jeremyfrench-master master
git pull git@github.com:jeremyfrench/chef-repo.git master
#
# Merge the changes onto the master branch, but roll-up, and leave in working directory:
#
git checkout master
git merge --squash jeremyfrench-master
#
# Commit the changes with appropriate attribution:
#
git commit --author "jeremyfrench <jeremy@jeremyfrench.co.uk>"