title: Branches have apparently diverged, but commit history is identical
body: <p><code>git status</code> tells me that my branch and the one I started from on another repository have diverged:</p>
  
  <pre><code># On branch master
  # Your branch and 'origin/master' have diverged,
  # and have 13 and 13 different commit(s) each, respectively.
  </code></pre>
  
  <p>but the commit history for each is identical.  That is, <code>git log</code> shows the same commits, in the same order, <em>with the same SHA-1 hashes</em>.  That's for the last 13 commits, and everything before that too.</p>
  
  <p>What's going on?!  Or have I misunderstood something fundamental - git's all new to me.</p>
  
  <p>It's quite a long story how I got into this mess - git-svn, cygwin, EGit, pull --rebase with spurious conflicts - but I'm wondering if it's possible this "divergence without any differences" is due to newlines?  I've opened  files in notepad, and read lots about svn/git/cygwin and CRLF but without any revelations.</p>
  
  <p><strong>Edit</strong>  OK. Most of the above isn't really the problem.  Maybe I don't understand <code>git log</code> or something has got messed up somewhere...</p>
  
  <p>I have two repositories.  If I go to rep_A and run <code>git log</code> I get the same result (notably same SHA-1) as if I go to rep_B and run <code>git log</code>.</p>
  
  <p>At rep_A, if I run <code>git log origin/master</code> I get the different commit history I expect.  (Different SHA-1s, but same messages - how I created this mess is another story.)</p>
  
  <p><code>git remote -v show</code> assures me that the origin is where I expect it to be.</p>
  
  <p><code>git log</code>, on rep_B, isn't behaving how I expected.  It's like it's giving me the commit history for rep_A.  What have I missed?</p>