From: layer Date: Thu, 05 Feb 2009 23:48:36 GMT Subject: Re: git merge ignoring whitespace Message-ID: <3047.1233877716@relay.known.net> In-Reply-To: <7vtz78a1pn.fsf@gitster.siamese.dyndns.org> Junio C Hamano wrote: >> layer writes: >> >> > Junio, on 3/25/07 you said: >> > >> > I know Linus does not like applying patches with whitespace >> > fuzziness, but I personally think a merge that ignores >> > whitespace changes would be a useful thing to have, without >> > having to call an external specialized merge backend. In other >> > words, I do not think it is so special a thing to want to, but >> > it is rather an unfortunate norm. I am not opposed to give >> > git-merge-recursive a command line option to tell it to merge >> > ignoring the whitespace-only changes, when it does the 3-way >> > file-level merge internally. >> > >> > Whatever came of this? >> >> I do not know. When I say "I am not opposed to", I mean just that. >> >> I may consider it a bad mode of operation, and I may hesitate to encourage >> people to use it as their default. But I do not feel strongly enough to >> veto it---as long as it is a rope you need to explicitly ask for to hang >> yourself with, I think it is Ok if we allowed such an option. >> >> It is not my itch to scratch, and I do not keep track. Thanks for the summary. >> Did you submit a patch that implements the new feature cleanly? Nope. I'm just barely emerging from newbie status, so I'm probably a ways away from implementing it. Kevin