From: Petr Baudis <pasky@suse.cz>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org, Shawn Pearce <spearce@spearce.org>
Subject: Re: [RFC] Merge strategy 'applyreject'
Date: Wed, 13 Sep 2006 23:50:49 +0200 [thread overview]
Message-ID: <20060913215049.GP18896@pasky.or.cz> (raw)
In-Reply-To: <7v1wqf789j.fsf@assigned-by-dhcp.cox.net>
Dear diary, on Wed, Sep 13, 2006 at 11:43:04PM CEST, I got a letter
where Junio C Hamano <junkio@cox.net> said that...
> Petr Baudis <pasky@suse.cz> writes:
> > .rej files, what a nuisance to handle those... :)
>
> You were who asked for "apply --reject", weren't you?
Yes, but the point of that was obviously different. (It's a nuisance,
but only when compared to the conflict markers (yes, a matter of opinion
of course).)
Thanks for it, BTW!
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Snow falling on Perl. White noise covering line noise.
Hides all the bugs too. -- J. Putnam
next prev parent reply other threads:[~2006-09-13 21:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-13 21:08 [RFC] Merge strategy 'applyreject' Shawn Pearce
2006-09-13 21:16 ` Petr Baudis
2006-09-13 21:43 ` Junio C Hamano
2006-09-13 21:50 ` Shawn Pearce
2006-09-13 21:54 ` Jakub Narebski
2006-09-13 22:26 ` Shawn Pearce
2006-09-13 21:50 ` Petr Baudis [this message]
2006-09-13 21:46 ` Shawn Pearce
2006-09-13 21:22 ` Jakub Narebski
2006-09-13 21:38 ` Shawn Pearce
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=20060913215049.GP18896@pasky.or.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=spearce@spearce.org \
/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).