LWN.net Logo

new patch and reject merging tool

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

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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Copyright © 2006, Eklektix, Inc.
Comments and public postings are copyrighted by their creators.
Linux is a registered trademark of Linus Torvalds