This technique updates your local branch and then "replays" your changes on top, effectively putting your changes at the head of the branch. Enable git config --global pull.rebase true Disable git config --global pull.rebase false