From patchwork Mon Feb 1 17:45:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 576642 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 474B9140C13 for ; Tue, 2 Feb 2016 04:45:54 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 65476A5C8A; Mon, 1 Feb 2016 17:45:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iiiqnRdOLhne; Mon, 1 Feb 2016 17:45:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0B84DA5C22; Mon, 1 Feb 2016 17:45:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E809C1C1557 for ; Mon, 1 Feb 2016 17:45:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E3FC395739 for ; Mon, 1 Feb 2016 17:45:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BwpkYomtYT5P for ; Mon, 1 Feb 2016 17:45:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from exchange.essensium.com (220.77.144.195.ipv4.evonet.be [195.144.77.220]) by hemlock.osuosl.org (Postfix) with ESMTPS id 2EE329573E for ; Mon, 1 Feb 2016 17:45:42 +0000 (UTC) Received: from localhost.localdomain (10.3.7.11) by beleexch01.local.ess-mail.com (10.3.7.8) with Microsoft SMTP Server (TLS) id 15.0.847.32; Mon, 1 Feb 2016 18:45:28 +0100 From: "Arnout Vandecappelle (Essensium/Mind)" To: Date: Mon, 1 Feb 2016 18:45:16 +0100 Message-ID: <1454348717-4711-4-git-send-email-arnout@mind.be> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454348717-4711-1-git-send-email-arnout@mind.be> References: <1454348717-4711-1-git-send-email-arnout@mind.be> MIME-Version: 1.0 X-Originating-IP: [10.3.7.11] X-ClientProxiedBy: beleexch01.local.ess-mail.com (10.3.7.8) To beleexch01.local.ess-mail.com (10.3.7.8) Subject: [Buildroot] [PATCH 3/4] docs/manual/contribute.txt: add section for preparing patch series X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" In subsequent patches, we will add more explanation about how to prepare patches, so it will be worthwhile to have a separate section for the series preparation. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: Yegor Yefremov --- Note: for this patch, I started using http://dustycloud.org/blog/vcs-friendly-patchable-document-line-wrapping/ If nobody opposes, I propose to require this formatting for the manual from now on. It will be weird for a while, but in the end I think it would be A Good Thing (TM). If that formatting had been followed, this patch, for example, would have a diffstat of +3 instead of the current +7-4. --- docs/manual/contribute.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index b74897d..e19ba15 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -182,10 +182,13 @@ _Please, do not attach patches to bugs, send them to the mailing list instead_. If you made some changes to Buildroot and you would like to contribute -them to the Buildroot project, proceed as follows. Starting from the -changes committed in your local git view, _rebase_ your development -branch on top of the upstream tree before generating a patch set. To do -so, run: + them to the Buildroot project, proceed as follows. + +==== Preparing a patch series + +Starting from the changes committed in your local git view, _rebase_ your + development branch on top of the upstream tree before generating a patch set. +To do so, run: --------------------- $ git fetch --all --tags