Removed push.rebase option and created a new alias, update, that calls
pull --ff-only.