title: Amend a git rebase
body: <p>I did a <code>git rebase master</code> which involved some manual merging in three files.  In one of them, I missed a trailing newline, resulting in the following at the end of the file:</p>
  
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  =======
  
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; ... commit message
  </code></pre>
  
  <p>which naturally results in a PHP error.  I can fix the file easily enough, but I don't want to add an erroneous "fix sloppy rebase" commit.  </p>
  
  <p>How can I amend this change to the rebase?  Or, repeat the rebase so I can catch it?</p>