title: How to view local changes with git and revert them?
body: <p>I cannot figure these out by myself (these are very easy to do with svn/rabbitvcs in Linux)</p>
  
  <ol>
  <li>How to view local changes against central server (origin?) for one file? (graphically)</li>
  <li>How to revert local changes for one file?</li>
  </ol>
  
  <p>Also, when i do a pull, i get this error:</p>
  
  <pre><code>n $ git pull
  error: Your local changes to the following files would be overwritten by merge:
      Application/powerbar.cpp
  Please, commit your changes or stash them before you can merge.
  Aborting
  </code></pre>
  
  <p>But when i do a <code>git diff</code> for the file it does not display anything.</p>
  
  <p><strong>Edit:</strong> Turns out that the file is a local file (powerbar.cpp), why does git want to overwrite my local file?</p>
  
  <p>Edit:
  When i do "git checkout myfile.cpp" the following is displayed: error: path 'myfile.cpp' is unmerged</p>
  
  <p>When i do "git reset myfile.cpp' then what exactly happens? It does NOT revert my local changes.</p>