- Stash your uncommitted changes:
git stash - Create a new branch:
git branch new_branch - Reset master to origin/master:
git reset --hard origin/master - Check out the new branch again:
git checkout new_branch - Unstash your changes:
git stash pop
Stash/unstash is not necessary if your working tree is clean. Just make sure there are no changes in your working tree, because those will be removed when you reset –hard
Another possibility (faster, and without the need to stash and reset):
- Check out a new branch:
git checkout -b new_branch master - Create a ‘new’ master branch and point it to origin/master’s commit:
git branch -f master origin/master