More robust 'git pull'