title: git selective revert local changes from a file
body: <p>In my git repo which is tracking a svn repo I have made a number of edits to a single file.</p>
  
  <p>Now I want to revert those changes(like svn revert), but only portions of the file.</p>
  
  <p>I want to be able to view the diffs on the file, discard(revert) the changes that I don't want and retain the changes I want.</p>
  
  <p>the </p>
  
  <pre><code>git add -i 
  </code></pre>
  
  <p>command seems to have an option to do that but I don't want to stage this yet.</p>