From: Linus Torvalds <torvalds@osdl.org>
Date: Wed, 05 Oct 2005 04:56:58 GMT
Subject: Re: [PATCH] Fall back to three-way merge when applying a patch.
Message-ID: <Pine.LNX.4.64.0510042155090.31407@g5.osdl.org>
In-Reply-To: <7vd5mk7pv6.fsf@assigned-by-dhcp.cox.net>



On Tue, 4 Oct 2005, Junio C Hamano wrote:
> 
>  * I will be placing this in the proposed updates branch.
>    Hopefully this would alleviate the complaints from people who
>    find the "no fuzz" policy of git-apply is too strict.

This should definitely be enabled by a switch only. 

For example, I use git-applypatch _only_ through git-applymbox. Ie 
non-interactively. I definitely do _not_ want it to try random other trees 
unless I tell it to, especially when applying a series of 175 patches in 
one go.

		Linus