git config pull.rebase false # merge (the default strategy) code example

Example 1: set git pull rebase default

## command
git pull --rebase

## configs
# git version >= 1.7.9
git config --global pull.rebase true
# git version < 1.7.9
git config --global branch.autosetuprebase always

Example 2: 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