Stashing

The docs and an Atlassian tutorial

Stashing

git stash

moves working directory to stash. Then you are safe to git pull.

Seeing diff between current and stash

See this stackoverflow question

git stash show -p

or for a specific stash

git stash show -p stash@{1}

Discarding stash

git stash drop

or

git stash drop stash@{1}