[grayclhn]

    git pull --rebase

doesn't merge implicitly and

    git config --global pull.rebase true

will set that as the default `pull` behavior.

[gechr]

Note that

  git config --global pull.rebase true

was added in v1.7.9 - if you're using an earlier version of Git for whatever reason, the config you should be setting is

  git config --global branch.autosetuprebase always

[fla]

Didn't know that. Thanks