From: Giuseppe Bilotta Date: Fri, 31 Jul 2009 16:16:43 GMT Subject: Re: [PATCHv3] git apply: option to ignore whitespace differences Message-ID: In-Reply-To: <94a0d4530907310838nbca0037u1a192dc07a379e66@mail.gmail.com> On Fri, Jul 31, 2009 at 5:38 PM, Felipe Contreras wrote: > On Fri, Jul 31, 2009 at 12:48 AM, Junio C Hamano wrote: >> Felipe Contreras writes: >> >>> Google: >>> ignore space change: 17,300,000 >>> ignore white space: 181,000,000 >> >> But that is not relevant either.  "ignore white space" is a superset of >> "ignore space change", iow the latter has more specific meaning than the >> former.  It is not surprising to see that search engines find larger >> number of references to more general terms than more specific ones. > > The fact remains the same: white space is a much more used term, and > IMHO the only one that really matters. Before I go on with the next revision of the patch, I would like to have some kind of agreed convention to implement. My suggestion would be the following: (1) implement options --ignore-space-change, --ignore-all-space mirroring their 'git diff' meaning. (2) add --ignore-whitespace as a synonym to --ignore-space-change, for consistency with 'patch' (3) apply.ignore-whitespace accepts values * false,no,none,0 to mean no whitespace ignoring * true,yes,change,1 to mean ignore whitespace change * all,2 to mean ignore all whitespace Objections? -- Giuseppe "Oblomov" Bilotta