Rebasing from master - make your feature branch clean (All credit to @joeyciechanowicz)

rebase_from_master.sh

git co -b feature-name
# ... do some stuff
git commit -am "message"
# .. go away for a while
git fetch origin/master
git rebase origin master
# ... do some more work
git add .
git commit --amend