title: Git: Everytime I rebase & merge it says my branch & origin have diverged?
body: <p>For example: </p>
  
  <p>If I do the following (rebase and merge staging onto master for prod release):</p>
  
  <ol>
  <li>git rebase -i master</li>
  <li>git checkout master &amp;&amp; git merge --no-ff staging</li>
  <li>git checkout staging
  
  <ul>
  <li>Here is where I get the your branch has diverged message. Every single time I rebase and merge I get it. This has never happened to me before so I'm worried my git history may be in a mess or something?</li>
  </ul></li>
  </ol>
  
  <p>Message:</p>
  
  <pre><code>Switched to branch 'staging'
  Your branch and 'origin/staging' have diverged,
  and have 20 and 19 different commits each, respectively.
    (use "git pull" to merge the remote branch into yours)
  </code></pre>
  
  <p>If I then run <code>git pull</code> &amp; <code>git status</code> it will say:</p>
  
  <pre><code>On branch staging
  Your branch is ahead of 'origin/staging' by 21 commits.
    (use "git push" to publish your local commits)
  nothing to commit, working directory clean
  </code></pre>
  
  <p>How is my local branch ahead of origin by 21 commits?! All I did was merge staging (which had 1 hotfix branch with 1 commit) into master?!</p>
  
  <p>Note that this will happen if I rebase and merge development onto staging. It's like it carries over for each release step?! </p>
  
  <p>My setup is as follows: development -> staging (release to staging server) -> production (release to production server)</p>
  
  <p>At the moment what I have todo is <code>reset --hard origin/&lt;branch&gt;</code> when this occurs</p>