Git pull new commits and save my work

Note to myself...

So I have changes, but want the newest stuff in the upstream master (I guess that's the name)

First add(stage) all your changes:

git add .

Them put them on "hold"...

git stash

Now get the new stuff

git pull

And bring your changes back

git apply

Git stashing Docu