stash

stash your changes then pull

git stash
git pull
git stash apply  // Or: git stash apply stash@{0}
git stash apply --index   // also reapply the staged changes

git stash list
git stash apply stash@{5}

git stash drop
git stash pop  //to apply the stash and then immediately drop it from your stack