title: Git: interactive rebase lists incorrect (too many) commits
body: <p>When I run <code>git rebase -i HEAD~2</code>, it lists 11 commits instead of 2. Why?</p>
  
  <p>What I've done prior to this was:</p>
  
  <ol>
  <li>Checked out upstream/branchA</li>
  <li>Rebased my new local copy of branchA with master</li>
  <li>Tried to push my local branchA back to upstream
  <ul>
  <li>Git complained that the branches were out of sync, and to first pull in upstream</li>
  </ul></li>
  <li>Pulled upstream/branchA into local branchA</li>
  <li>Pushed local branchA to upstream/branchA (success)</li>
  </ol>