From: A Large Angry SCM <gitzilla@gmail.com>
Date: Sun, 28 Aug 2005 20:49:35 GMT
Subject: Re: [PATCH 6/9] New option --ignore-whitespace for git-apply.
Message-ID: <4312235F.2040907@gmail.com>
In-Reply-To: <Pine.LNX.4.58.0508280956320.3317@g5.osdl.org>

Linus Torvalds wrote:
> On Sun, 28 Aug 2005, Robert Fitzsimons wrote:
>>Allow the user to force a patch to be applied even though there might
>>be whitespace differences.  Added a test case for the new option.
> 
> If you ignore whitespace, then you should probably accept patches that are
> whitespace corrupted in another way: lines missing the ' ' at the
> beginning. Especially lines that are empty. That's actually the most 
> common form of whitespace corruption there is.

Actually, a more restricted from of --ignore-whitespace may be useful, 
--ignore-trailing-whitespace (needs a shorter name!). Ignore only 
trailing whitespace differences (including empty context lines without 
the initial space).