title: During git cherry-pick, undo changes to a single file, reverting to my version
body: <p>I'm doing a <code>cherry-pick</code> for a large commit with multiple files. There are some conflicts, but for some of the conflicting files I'm sure that I don't need any of the changes. I'd just like to revert all changes applied to these files in that commit - a bit like 'resolve using mine' in svn, or <code>git checkout &lt;filename&gt;</code> to undo changes applied to a file (which doesn't seem to work here). </p>
  
  <p>Is there a command to do this, without manually having to go through the diffs in these files?</p>
  
  <p>FFR, feel free to also include the operation to resolve using <em>theirs</em>.</p>