Answers for "git pull pulling without specifying how to reconcile divergent branches"

Pulling without specifying how to reconcile divergent branches is

git config pull.rebase false

Git: warning: Pulling without specifying how to reconcile divergent branches is

To fix this go to
http://github.com/settings/emails

and unmark the box: Keep my email addresses private