Re: Bootstrapping into git, commit gripes at me

From: Petr Baudis <pasky@suse.cz>
Date: Jul 10, 2005, 15:06 UTC
Message-ID: <20050710150609.GC24249@pasky.ji.cz>
In-Reply-To: <pan.2005.07.09.21.04.29.263374@smurf.noris.de>

Dear diary, on Sat, Jul 09, 2005 at 11:04:37PM CEST, I got a letter where Matthias Urlichs <smurf@smurf.noris.de> told me that...

> >  o Is there a way to force git to apply and safe the rejects?
> 
> Well, you can use "patch -p1 ..." directly, and manually add the files it
> created to the object cache. Personally I wouldn't, if at all possible.

Or you can do cg-patch, which should handle that for you properly as well. I think the "no fuzz" approach is hyper-paranoid. I deal with small or larger fuzz all the time when I'm reordering patches or applying them to a few hours younger version than they were based on. I think the restriction it imposes is overly draconian here and doesn't trust the developer to know what he is doing as much as it should. (And that's why cg-patch doesn't use git-apply. ;-)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
<Espy> be careful, some twit might quote you out of context..