git 出现You can replace “git config“ with “git config --global“ to set a default hint:

hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. fatal: Need to specify how to reconcile divergent branches.

解决方法：

终端运行：git config pull.rebase false