The first is by making a new branch, and then merging the diverging histories: git checkout -b tempfeature git checkout feature git merge tempfeature You can also use git stash to store changes ...