Git scratchpad

#Like hg pull. Pulls all branches
git fetch <remote> (e.g. git fetch origin)

#Then to see what has been pulled (between my local master and the origin/master)
git log --oneline master..origin/master

#If not on master branch, switch to it
git checkout master

#Then merge the changes (like hg up)
git merge origin/master

#Or simply
git pull <remote>
#Or to rebase
git pull --rebase <remote>