title: Choose Git merge strategy for specific files ("ours", "mine", "theirs")
body: <p>I am in the middle of rebasing after a <code>git pull --rebase</code>.  I have a few files that have merge conflicts.  How can I accept "their" changes or "my" changes for specific files?</p>
  
  <pre><code>$ git status
  # Not currently on any branch.
  # You are currently rebasing.
  #   (fix conflicts and then run "git rebase --continue")
  #   (use "git rebase --skip" to skip this patch)
  #   (use "git rebase --abort" to check out the original branch)
  #
  # Changes to be committed:
  #   (use "git reset HEAD &lt;file&gt;..." to unstage)
  #
  #       modified:  CorrectlyMergedFile
  #
  # Unmerged paths:
  #   (use "git reset HEAD &lt;file&gt;..." to unstage)
  #   (use "git add &lt;file&gt;..." to mark resolution)
  #
  #       both modified: FileWhereIWantToAcceptTheirChanges
  #       both modified: FileWhereIWantToAcceptMyChanges
  </code></pre>
  
  <p>Normally I just open the file or a merge tool and manually accept all "their" or "my" changes.  However, I suspect I'm missing a convenient git command.</p>
  
  <p>Also, note that I will only be able to choose a merge strategy for each file when I see what files hit conflicts an possibly what the conflicts are.</p>