title: Error when reordering commits with git rebase -i
body: <p>I'm trying to reorder 2 commits, and I keep getting an error without any kind of explanation, so I have no idea what I'm doing wrong.</p>
  
  <p>This is the repo:</p>
  
  <pre><code>$ git lol
  * c0000ca (HEAD, master) added a title
  * 132247f Turned colors to html
  * 0ddaef3 Added last sentences
  * 95f8007 initial commit
  </code></pre>
  
  <p>I want to swap 132247f and 0ddaef3.</p>
  
  <pre><code>$ git rebase -i 95f8007
  </code></pre>
  
  <p>This takes me into nano:</p>
  
  <pre><code>pick 0ddaef3 Added last sentences
  pick 132247f Turned colors to html
  pick c0000ca added a title
  
  # Rebase 95f8007..c0000ca onto 95f8007
  #
  # Commands:
  #  p, pick = use commit
  #  r, reword = use commit, but edit the commit message
  #  e, edit = use commit, but stop for amending
  #  s, squash = use commit, but meld into previous commit
  #  f, fixup = like "squash", but discard this commit's log message
  #  x, exec = run command (the rest of the line) using shell
  #
  # These lines can be re-ordered; they are executed from top to bottom.
  #
  # If you remove a line here THAT COMMIT WILL BE LOST.
  # However, if you remove everything, the rebase will be aborted.
  #
  # Note that empty commits are commented out
  </code></pre>
  
  <p>I swap both lines, save and exit. This is the error message I get:</p>
  
  <pre><code>error: could not apply 132247f... Turned colors to html
  
  
  When you have resolved this problem, run "git rebase --continue".
  If you prefer to skip this patch, run "git rebase --skip" instead.
  To check out the original branch and stop rebasing, run "git rebase --abort".
  Could not apply 132247f... Turned colors to html
  </code></pre>
  
  <p>As an error message, it's not very useful.... Anybody knows what's going on?</p>
  
  <p>The only file in the repo seems to be in conflict:</p>
  
  <pre><code>$ cat poem.md
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  Roses are red.
  Violets are blue.
  
  =======
  Roses are #ff0000.
  Violets are #0000ff.
  All of my bases,
  are belong to you.
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; 132247f... Turned colors to html
  </code></pre>
  
  <p>If I solve the conflict, add the file and run git rebase --continue, I get this other error:</p>
  
  <pre><code>$ git rebase --continue
  [detached HEAD 9aba127] Turned colors to html
   1 file changed, 4 insertions(+), 2 deletions(-)
  error: could not apply 0ddaef3... Added last sentences
  
  When you have resolved this problem, run "git rebase --continue".
  If you prefer to skip this patch, run "git rebase --skip" instead.
  To check out the original branch and stop rebasing, run "git rebase --abort".
  Could not apply 0ddaef3... Added last sentences
  </code></pre>
  
  <p>This is driving me crazy, any help is appreciated.</p>