title: 'Ignore' binary files in git rebase 'theirs'
body: <p>I want to go from this</p>
  
  <pre><code>A - B - C - D - E - F - G 
  </code></pre>
  
  <p>where Branch1 is pointing at E and Branch2 is pointing at G</p>
  
  <p>to this:</p>
  
  <pre><code>Branch1:    A - B - C - D - E
                       \
  Branch2:              F - G
  </code></pre>
  
  <p>And I want Branch2 to always 'win', I've got as far as this:</p>
  
  <pre><code>git rebase -s recursive -X theirs --onto C Branch1 Branch2
  </code></pre>
  
  <p>That works fine - except that rebase chokes on binary files - saying it can't merge them. How do I go about telling git that I don't want to merge them, I just want to take 'theirs' each time?</p>