git pull with rebase (when working in master)

gistfile1.sh

# if working in local master directly instead of in a feature branch:
# you want to bring in updates that have occurred on the remote branch
# without creating a merge commit

# this will rewind your commits, bring in changes from master,
# then put your changes back on top
git pull --rebase
# git pull --rebase origin master

# then a push will look like your changes have occurred on top of the latest
# master branch code
git push
# git push origin master

# more information http://gitready.com/advanced/2009/02/11/pull-with-rebase.html