and remember this is much better than git pull master
on a feature branch:
# use git pull on in master branch! so it will never create nasty merge commits
git checkout master
git pull origin master
# development
git checkout -b your_feature_branch
# rebase your changes over changed master: