Just putting stuff I find out over here, so I can remember and find them more easily.
git pull --rebase