title: git apply : error trailing whitespace
body: <p>Lately, I've been playing a little bit with git. I'm trying to simulate to apply a patch to my master branch, this patch comprehends a commit where I added some comments to a java operation. I generated the patch using git <code>format-patch</code>. Then I switched to my master branch to apply the patch.
  the following errors occurred when executing the git apply command : </p>
  
  <pre><code>path/to/my/patch/file: line x
  path/to/my/patch/file: line x+1
  path/to/my/patch/file: line x+2
  path/to/my/patch/file: line x+3
  </code></pre>
  
  <p>I note that I also tried  the following arguments : <code>--ignore-space</code>, <code>ignore-whitespace</code>, </p>