From: Petr Baudis <pasky@suse.cz>
To: Matthias Urlichs <smurf@smurf.noris.de>
Cc: git@vger.kernel.org
Subject: Re: Bootstrapping into git, commit gripes at me
Date: Sun, 10 Jul 2005 17:06:09 +0200 [thread overview]
Message-ID: <20050710150609.GC24249@pasky.ji.cz> (raw)
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..
next prev parent reply other threads:[~2005-07-10 15:06 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-07-08 23:07 Bootstrapping into git, commit gripes at me Marc Singer
[not found] ` <7v4qb46dff.fsf@assigned-by-dhcp.cox.net>
2005-07-09 1:11 ` Marc Singer
2005-07-09 21:04 ` Matthias Urlichs
2005-07-10 15:06 ` Petr Baudis [this message]
[not found] ` <20050709003636.GA26526@buici.com>
[not found] ` <7v1x684wgr.fsf@assigned-by-dhcp.cox.net>
2005-07-09 1:16 ` Marc Singer
2005-07-09 1:31 ` Junio C Hamano
2005-07-09 1:43 ` Linus Torvalds
2005-07-11 22:20 ` Marc Singer
2005-07-11 23:03 ` Junio C Hamano
2005-07-11 23:15 ` Junio C Hamano
2005-07-12 0:57 ` Linus Torvalds
2005-07-12 1:43 ` Linus Torvalds
2005-07-12 2:10 ` Marc Singer
2005-07-12 3:09 ` Linus Torvalds
2005-07-12 3:49 ` Linus Torvalds
2005-07-12 4:34 ` Linus Torvalds
2005-07-12 4:43 ` Marc Singer
2005-07-12 4:59 ` Linus Torvalds
2005-07-12 5:12 ` Marc Singer
2005-07-12 7:48 ` Petr Baudis
2005-07-12 9:07 ` Junio C Hamano
2005-07-12 16:29 ` Matthias Urlichs
2005-07-24 8:57 ` Petr Baudis
2005-07-24 16:24 ` Junio C Hamano
2005-07-12 16:48 ` Linus Torvalds
2005-08-12 1:26 ` Petr Baudis
2005-07-12 2:21 ` Junio C Hamano
2005-07-12 3:18 ` Linus Torvalds
2005-07-12 3:41 ` Junio C Hamano
2005-07-12 3:52 ` Linus Torvalds
2005-07-12 3:53 ` Marc Singer
2005-07-12 17:04 ` Daniel Barkalow
2005-07-11 23:45 ` Linus Torvalds
-- strict thread matches above, loose matches on Subject: below --
2005-07-09 0:40 Marc Singer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050710150609.GC24249@pasky.ji.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
--cc=smurf@smurf.noris.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).