From: Catalin Marinas <catalin.marinas@arm.com>
To: Michelle Konzack <linux4michelle@freenet.de>
Cc: linux-kernel@vger.kernel.org
Subject: Re: diff command line?
Date: Mon, 07 Mar 2005 14:13:50 +0000 [thread overview]
Message-ID: <tnxpsybczmp.fsf@arm.com> (raw)
In-Reply-To: <20050307105153.GL26452@freenet.de> (Michelle Konzack's message of "Mon, 7 Mar 2005 11:51:53 +0100")
Michelle Konzack <linux4michelle@freenet.de> 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
next prev parent reply other threads:[~2005-03-07 14:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-05 15:48 diff command line? Gene Heskett
2005-03-05 16:18 ` Russell King
2005-03-05 16:44 ` Gene Heskett
2005-03-05 16:45 ` Jim Nelson
2005-03-05 17:06 ` Gene Heskett
2005-03-09 4:23 ` [PATCH][Documentation update]Re: " John Kacur
2005-03-07 10:51 ` Michelle Konzack
2005-03-07 14:13 ` Catalin Marinas [this message]
2005-03-07 15:08 ` Michelle Konzack
2005-03-05 17:00 ` Kyle McMartin
2005-03-05 17:26 ` Alexey Dobriyan
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=tnxpsybczmp.fsf@arm.com \
--to=catalin.marinas@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux4michelle@freenet.de \
/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