From: Chris Mason <chris.mason@oracle.com>
To: linux-kernel@vger.kernel.org
Subject: [CFT] new patch and reject merging tool
Date: Mon, 9 Oct 2006 11:32:07 -0400 [thread overview]
Message-ID: <20061009153207.GU8689@think.oraclecorp.com> (raw)
Hello everyone,
I've reworked my rej code somewhat into a new utility that can apply
unified diffs and git diffs (git patch support is from Brendan Cully).
It has a mode for auto-resolving rejects, but by default it is as safe
as patch, and much faster than rej was.
Download locations and details are here:
http://oss.oracle.com/~mason/mpatch/
-chris
reply other threads:[~2006-10-09 15:32 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20061009153207.GU8689@think.oraclecorp.com \
--to=chris.mason@oracle.com \
--cc=linux-kernel@vger.kernel.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