How to configure "git pull --ff-only" and "git merge --no-ff" : <p>A typical git workflow for me is to clone a remote repository and use git pull to keep it up-to-date. I don't want merge commits when I pull, so i use the --ff-only option.</p>

<p>I also make local branches for feature work. I want to preserve the branch history, so when I merge the local branch back to my local clone, I use the --no-ff option.</p>

<p>How can I configure git to use those options by default? Currently my .gitconfig looks like this:</p>

<pre><code>[merge]
  ff = false
[pull]
  ff = only
</code></pre>

<p>However, git pull (which is really git fetch and git merge) seems to be picking up the merge option and therefore creating merge.</p>
