title: git rebase failing due to whitespace error
body: <p>I'm trying to rebase a branch and git is pooping out because it's attempting to perform some merge action which fails. How do I get git to stop this?</p>
  
  <pre><code># git rebase -f --onto master~2 master~ master
  First, rewinding head to replay your work on top of it...
  Applying: r1002 - CS 1.0.23
  Using index info to reconstruct a base tree...
  M   about.html
  &lt;stdin&gt;:68: trailing whitespace.                     
  &lt;stdin&gt;:115: trailing whitespace.
  &lt;stdin&gt;:201: trailing whitespace.
  &lt;stdin&gt;:2369: trailing whitespace.
  &lt;stdin&gt;:2385: trailing whitespace.
  warning: squelched 2305 whitespace errors
  warning: 2310 lines add whitespace errors.
  Falling back to patching base and 3-way merge...
  Auto-merging about.html
  CONFLICT (content): Merge conflict in about.html
  Failed to merge in the changes.
  Patch failed at 0001 r1002 - 1002
  The copy of the patch that failed is found in:
     /local/melder/tmp/test/.git/rebase-apply/patch
  
  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".
  </code></pre>
  
  <p>As you can see there are 2000+ whitespace errors, not something easy to merge by hand.</p>
  
  <p><strike> Edit: to side step this for now without merging I did:</p>
  
  <pre><code># git add -A
  # git rebase --continue
  </code></pre>
  
  <p></strike></p>
  
  <p>Edit: nevermind that is a silly idea.</p>