Teach 'git merge' and 'git pull' the option --ff-only