No new local work git switch branchname git pull --rebase Update and preserve local work git switch branchname git fetch git reset origin/branchname --soft