From patchwork Tue Apr 29 19:30:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waldemar Brodkorb X-Patchwork-Id: 343980 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 56CC81400E9 for ; Wed, 30 Apr 2014 05:30:46 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8DFD18B1F3; Tue, 29 Apr 2014 19:30:45 +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 Q-WPaedu3GDM; Tue, 29 Apr 2014 19:30:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 150A08AFFB; Tue, 29 Apr 2014 19:30:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 8D93B1C1EA4 for ; Tue, 29 Apr 2014 19:30:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 40D1F8AFD6 for ; Tue, 29 Apr 2014 19:30:42 +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 I2v_YKLfML6B for ; Tue, 29 Apr 2014 19:30:41 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from helium.waldemar-brodkorb.de (helium.waldemar-brodkorb.de [89.238.66.15]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 59287896D8 for ; Tue, 29 Apr 2014 19:30:41 +0000 (UTC) Received: by helium.waldemar-brodkorb.de (Postfix, from userid 1000) id C4C29102BB; Tue, 29 Apr 2014 21:30:39 +0200 (CEST) From: Waldemar Brodkorb To: buildroot@buildroot.org Date: Tue, 29 Apr 2014 21:30:27 +0200 Message-Id: <1398799827-13701-1-git-send-email-wbx@openadk.org> X-Mailer: git-send-email 1.7.10.4 Subject: [Buildroot] [PATCH] give a hint about git rebase X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net It seems common knowledge to use git rebase in interactive mode to fixup issues while respinning patch series, but I found it hard to find any hint about it. Add a note for git beginners like me. Signed-off-by: Waldemar Brodkorb --- docs/manual/contribute.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index 47494cb..7795e71 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -230,6 +230,8 @@ should include a changelog of the modifications between each submission. Note that when your patch series is introduced by a cover letter, an overall changelog may be added to the cover letter in addition to the changelog in the individual commits. +The best thing to rework a patch series is by using +git rebase+ +in interactive mode. When added to the individual commits, this changelog is added when editing the commit message. Below the +Signed-off-by+ section, add