From: Chris Mason <mason@suse.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Linus Torvalds <torvalds@osdl.org>,
Jeff Garzik <jgarzik@pobox.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Linux Kernel list <linux-kernel@vger.kernel.org>,
James Bottomley <James.Bottomley@steeleye.com>,
David Woodhouse <dwmw2@infradead.org>
Subject: Re: New SCM and commit list
Date: Mon, 11 Apr 2005 15:32:49 -0400 [thread overview]
Message-ID: <200504111532.50330.mason@suse.com> (raw)
In-Reply-To: <200504110851.14416.mason@suse.com>
On Monday 11 April 2005 08:51, Chris Mason wrote:
> rej -M skips the merge program, so rej -a -M will give you something like
> this:
>
> coffee:/local/linux.p # rej -a -M drivers/ide/ide.c.rej
> drivers/ide/ide.c: 1 matched, 0 conflicts remain
>
> But I would want to go over the bit that calculates the conflicts remaining
> more carefully if people plan on trusting this ;)
Ok, looks like this should be safe. I changed -q to skip the gui compare
when rej thinks it has resolved all the conflicts correctly. With rej 0.14
(just uploaded now) this should do what you want:
rej -q -a foo.rej
Download site is here: ftp://ftp.suse.com/pub/people/mason/rej/
Please let me know if you find patches where rej is doing the wrong thing.
-chris
next prev parent reply other threads:[~2005-04-11 19:38 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-10 23:10 New SCM and commit list Benjamin Herrenschmidt
2005-04-10 23:26 ` Linus Torvalds
2005-04-11 3:25 ` James Bottomley
2005-04-11 20:53 ` Greg KH
2005-04-11 21:26 ` Linus Torvalds
2005-04-11 21:31 ` James Bottomley
2005-04-12 4:24 ` Arjan van de Ven
2005-04-13 20:04 ` H. Peter Anvin
2005-04-11 5:53 ` Jeff Garzik
2005-04-11 6:15 ` Linus Torvalds
2005-04-11 6:40 ` Ryan Anderson
2005-04-11 6:47 ` Geert Uytterhoeven
2005-04-11 7:38 ` Ingo Molnar
2005-04-11 12:51 ` Chris Mason
2005-04-11 19:32 ` Chris Mason [this message]
2005-04-11 22:50 ` Daniel Barkalow
2005-04-12 8:36 ` Geert Uytterhoeven
2005-04-12 9:52 ` Catalin Marinas
2005-04-16 8:35 ` Paul Jackson
2005-04-18 8:18 ` Catalin Marinas
2005-04-11 7:13 ` David Woodhouse
-- strict thread matches above, loose matches on Subject: below --
2005-04-11 18:18 Adam J. Richter
2005-04-12 3:02 Adam J. Richter
2005-04-12 21:54 ` Daniel Barkalow
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=200504111532.50330.mason@suse.com \
--to=mason@suse.com \
--cc=James.Bottomley@steeleye.com \
--cc=benh@kernel.crashing.org \
--cc=dwmw2@infradead.org \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=torvalds@osdl.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.