title: How do I select a merge strategy for a git rebase?
body: <p><code>git-rebase</code> man page mentions <code>-X&lt;option&gt;</code> can be passed to <code>git-merge</code>. When/how exactly?</p>
  
  <p>I'd like to rebase by applying patches with <em>recursive</em> strategy and <em>theirs</em> option (apply whatever sticks, rather than skipping entire conflicting commits). I don't want merge, I want to make history linear.</p>
  
  <p>I've tried:</p>
  
  <pre class="lang-sh prettyprint-override"><code>git rebase -Xtheirs
  </code></pre>
  
  <p>and</p>
  
  <pre class="lang-sh prettyprint-override"><code>git rebase -s 'recursive -Xtheirs'
  </code></pre>
  
  <p>but git rejects <code>-X</code> in both cases.</p>
  
  <hr>
  
  <p><code>git rebase -Xtheirs</code> works in recent versions, except tree conflicts need to be resolved manually. You need to run <code>git rebase -Xtheirs --continue</code> (with <code>-X</code> repeated) after resolving those conflicts.</p>