On Sat, 30 Nov 2019 17:20:10 -0800 Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > Do you use some special options for git? Like --whitespace=nowarn or > --3way or something like that? Sigh, that has to be it. I have --ignore-whitespace in my script. When I take that option out, the patch in question no longer applies. Docs patches often come from relatively new folks, and I've found that I needed that to apply a lot of their patches. But clearly that was not a good choice; among other things, I've lost the opportunity to tell people when their patches have the types of whitespace issues that this option covers over. I've taken it out of the script and will only use it by hand in cases where I'm sure that it won't cause problems. Sorry for the screwup... jon
