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

Update Forked GitHub Repository

Note to myself...

My changes should be Committed to my current master or AwesomeNewFeature branch

Add origin repo...

git remote add upstream http:// original repo.git

Get current version

git fetch upstream

Get my stuff back into working directory

git checkout master / AwesomeNewFeature

With some luck I can merge the upstream master with my branch

git merge upstream/master

Upload to Github

git push