Git Tricks: Avoiding merge when dealing with remote conflicts
And<p><pre><code>  git config --global branch.autoSetupRebase always
</code></pre>
will ensure that all your <i>future</i> branches are automatically setup to `rebase` instead of `merge` on pull.