Discussion and demonstration of remote tracking branches and adding remotes.

$ git ls-remote [<remote>]
$ git remote -v
$ git remote prune

$ git fetch --all
$ git push origin thisbranch:thatbranch
$ git push origin --delete <branchname>

$ git checkout --track origin/serverfix
$ git checkout -b sf origin/serverfix
$ git branch [-u|--set-upstream-to] origin/serverfix

Shorthand if you're on the master branch:

$ git merge origin/master
$ git merge @{upstream}
$ git merge @{u}

$ git fetch [-p|--prune]