title: Merging without whitespace conflicts
body: <p>I've got a problem, where a large commit which changes about a thousand lines of code, removing whitespace from the end of lines and removing spaces before tabs.</p>
  <p>There are also about 50 pull requests for this project, in which all will get conflicts, when my commit is merged. Is there any way that git can be set up so that when merging future commits, it ignores conflicts where one of them is just a whitespace change?</p>
  <p>Modifying git itself or using a third party tool isn't possible, but using a hook is fine.</p>