title: Have I lost my changes after rebasing?
body: <p>I recently rebased a branch that I was working on. The history of the tree looked something like this:</p>
  
  <pre><code>1 = 2 = 3 = 4
       \
        5 = 6 = 7
             \
              8
  </code></pre>
  
  <p>I wanted to rebase my changes (number 8 in the diagram) to be on the master branch (up to commit 4 on the diagram now). So I did the following:</p>
  
  <pre><code>git checkout my_branch
  git rebase master
  </code></pre>
  
  <p>&lt; lots of git mergetool/git rebase --skip to resolve conflicts ></p>
  
  <p>Only now when I run:</p>
  
  <pre><code>git checkout my_branch
  git diff master
  </code></pre>
  
  <p>I get zero differences. I haven't lost my branch (I can still recreate my changes from a patch that I saved) but I can't find the merge/rebase that I did. What did I do wrong? Is the rebase still there somewhere with my changes merged with the master or do I have to do it again?</p>