title: Git: how is a branch I'm not committing to ahead of origin/master
body: <p>I work 100% with a branch that I made off of the master branch. Now that a colleague has pushed back to origin/master, I tried to push those changes into my personal branch. When I do a 'git checkout master' followed by a 'git status' I get the following:</p>
  
  <pre><code># Your branch is ahead of 'origin/master' by 2 commits.
  </code></pre>
  
  <p>How is a branch I never commit to ahead by 2 commits? What's the best way to find out what commits they are and essentially undo them? I don't wish to push anything back to origin/master as that might cause unknown conflicts.</p>