Add `git fetch`.

So we don’t end up branching from an out of date upstream.
Don’t count upstream→ready merge commits.

Previously, if `ready` had to merge, then failed either due to a merge
conflict or test failures, rerunning it again would do the wrong
thing (because the merge commit would cause it would assume you hadn’t
squashed all your commits). This now ignores merge commits when counting
commits.