Comment by adaboese

I cannot be the only one that gets away with only knowing:

  git pull
  git merge x
  git checkout [-b] foo
  git commit
  git push