Re: diff command line?

From: Catalin Marinas
Date: Mon Mar 07 2005 - 09:15:45 EST


Michelle Konzack <linux4michelle@xxxxxxxxxx> wrote:
> Am 2005-03-05 16:18:24, schrieb Russell King:
>> On Sat, Mar 05, 2005 at 10:48:00AM -0500, Gene Heskett wrote:
>> > What are the options normally used to generate a diff for public
>> > consumption on this list?
>>
>> diff -urpN orig new
>
> This is what I using curently
>
> diff -Nurp src.orig/linux src/linux >src.diff/linux
>
> Now I have a question: How can one create this Type of patches ?
> (Curently I am using scripts to strip "src.orig" and "src")

Two ways:
$ mv src.orig/linux linux.orig
$ mv src/linux linux
$ diff -Nurp linux.orig linux

or
$ diff -Nurp src.orig/linux src/linux | filterdiff --strip=1

Catalin

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