Split up git-pull-script into separate "fetch" and "merge" phases.