From: Junio C Hamano <junkio@cox.net>
Date: Fri, 09 Sep 2005 01:03:47 GMT
Subject: Re: git applymbox is too anal
Message-ID: <7vd5njrr0s.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20050908233906.GA7976@kroah.com>

Greg KH <greg@kroah.com> writes:

> So, the patch shows that there was another line at the end of the file,
> while in reality it isn't (this is due to me excluding a patch from the
> series that I'm applying due to other reasons.)
>
> Is this something that git can handle without me editing the patch by
> hand?  :)

Linus was quite strict about rejecting any fuzz, but I am
sympathetic to the cause.  I do not mind if somebody comes up
with a patch to add '--fuzz' option to git-apply; we can try
applying first without --fuzz and ask the user if he wants one
from 'git applymbox' main loop when it fails.