Please be careful about introducing trailing whitespace. I suggest adding the following to your git config:

> [apply]
>         whitespace = fix