Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932104AbVLTVnp (ORCPT ); Tue, 20 Dec 2005 16:43:45 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932139AbVLTVnp (ORCPT ); Tue, 20 Dec 2005 16:43:45 -0500 Received: from wproxy.gmail.com ([64.233.184.205]:46570 "EHLO wproxy.gmail.com") by vger.kernel.org with ESMTP id S932104AbVLTVno convert rfc822-to-8bit (ORCPT ); Tue, 20 Dec 2005 16:43:44 -0500 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:mime-version:content-type:content-transfer-encoding:content-disposition; b=RO/6f2yGvK7s0pu1/jlh6c/LoY0qaVoX37KXm2ySNo5eXyXriP/eEEYk+XB25UXLq7RZR0SsRl1kVIVumWy+LLypQZ+2cQckT00u9osDZ5tVlW6oMQyw2I/8RYltFSA4Z0ujcExf1AXCc7YShpNlpE0VUwqB3XM4gGwCZSbiHhQ= Message-ID: Date: Wed, 21 Dec 2005 10:43:40 +1300 From: Ian McDonald To: Linux Kernel Mailing List Subject: Revised [PATCH] Documentation: Update to SubmittingPatches Cc: trivial@rustcorp.com.au, Andrew Morton , Linus Torvalds MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2368 Lines: 57 Updated documentation for submitting patches taking account of git. Signed-off-by: Ian McDonald --- diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 237d54c..8756475 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -20,10 +20,24 @@ SECTION 1 - CREATING AND SENDING YOUR CH -1) "diff -up" ------------- +1) Creating a diff file +----------------------- -Use "diff -up" or "diff -uprN" to create patches. +You can use git-diff(1) or git-format-patch(1) which makes your life easy. If +you want it to be more difficult then carry on reading. + +Make sure your patch does not include any extra files which do not +belong in a patch submission. Make sure to review your patch -after- +generated it with diff(1), to ensure accuracy. + +If your changes produce a lot of deltas, you may want to look into +splitting them into individual patches which modify things in +logical stages. This will facilitate easier reviewing by other +kernel developers, very important if you want your patch accepted. +There are a number of scripts which can aid in this: + +Use "diff -up" or "diff -uprN" to create patches +------------------------------------------------ All changes to the Linux kernel occur in the form of patches, as generated by diff(1). When creating your patch, make sure to create it @@ -61,16 +75,6 @@ patch. The "dontdiff" file is included 2.6.12 and later. For earlier kernel versions, you can get it from . -Make sure your patch does not include any extra files which do not -belong in a patch submission. Make sure to review your patch -after- -generated it with diff(1), to ensure accuracy. - -If your changes produce a lot of deltas, you may want to look into -splitting them into individual patches which modify things in -logical stages. This will facilitate easier reviewing by other -kernel developers, very important if you want your patch accepted. -There are a number of scripts which can aid in this: - Quilt: http://savannah.nongnu.org/projects/quilt - 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/