Say I have a feature branch, into which I merge upstream changes prior to pushing my changes back: git branch feature1 ... [edit my code] ... [commit] git fetch origin master git merge fetch_head ...