title: Turn off fast-forward merging for regular merge, but not for pull
body: <p>I want git to always make merge commits (<code>--no-ff</code>) when I use <code>git merge</code>, but keep the default behavior (<code>--ff</code>) for <code>git pull</code>. Is this possible (with configs)?</p>