Use git-merge in git-pull (second try).