git checkout master git branch feature_x git reset --hard upstream/master git pull upstream master git checkout feature_x git rebase master # edit feature x git add . git commit git push origin feature_x # create pull request