title: autosetuprebase vs autosetupmerge
body: <p>I was just knocking around in my global <code>.gitconfig</code> file and I noticed that I've managed to end up with this:</p>
  
  <pre><code>[branch]
    autosetupmerge = always
    autosetuprebase = always
  </code></pre>
  
  <p>That seemed more than a little counterintuitive, but after doing some reading, I still have no idea whether I need both or whether it's sufficient to remove <code>autosetupmerge</code> and just retain <code>autosetuprebase</code>. Most projects that I'm working have a straight downstream->upstream flow, so rebasing is generally preferred when dealing with branches.</p>