git pull问题 git config pull.rebase false

 You can replace "git config" with "git config --global" to set a default
 preference for all repositories. You can also pass --rebase, --no-rebase,
 or --ff-only on the command line to override the configured default per
 invocation.

//执行一下默认策略就行了 
git config pull.rebase false