Comment by emrox

also available on git

  git checkout master
  git checkout my-branch
  git pull
  git checkout -
  git merge -