We should make git-merge-forward.sh always do a git-pull-all.sh. And we should make git-pull-all.sh fail if the pull is not a fast-forward merge.