From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752776AbaHTUCg (ORCPT ); Wed, 20 Aug 2014 16:02:36 -0400 Received: from cantor2.suse.de ([195.135.220.15]:54986 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750734AbaHTUCe (ORCPT ); Wed, 20 Aug 2014 16:02:34 -0400 Message-ID: <53F4FED4.7060408@suse.de> Date: Wed, 20 Aug 2014 22:02:28 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Organization: SUSE LINUX Products GmbH User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.7.0 MIME-Version: 1.0 To: Javier Martinez Canillas CC: Viresh Kumar , Tuomas Tynkkynen , Tuomas Tynkkynen , "linux-tegra@vger.kernel.org" , Linux Kernel Mailing List , "linux-arm-kernel@lists.infradead.org" , "linux-pm@vger.kernel.org" , Stephen Warren , Thierry Reding , Peter De Schrijver , Prashant Gaikwad , Mike Turquette , "Rafael J. Wysocki" , Paul Walmsley , Vince Hsu , "devicetree@vger.kernel.org" Subject: Handling commit change logs (was: [PATCH v3 13/15] cpufreq: Add cpufreq driver for Tegra124) References: <1408419205-10048-1-git-send-email-tuomas.tynkkynen@iki.fi> <1408419205-10048-14-git-send-email-tuomas.tynkkynen@iki.fi> <53F3A900.8010805@nvidia.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Javier, Am 20.08.2014 17:39, schrieb Javier Martinez Canillas: > As you already know when you apply a patch with git am, everything > that is between a line with 3 dashes line (---) and the actual diff is > omitted since that is where the generated diffstat is placed by git > format-patch. > > We usually rely on that behavior to put there the history of a patch > or any information that we think that is useful for reviewers but is > not suitable to end in the commit message. Now that means that you > have to generate the patch and then manually edit it to add the > history there. > > But since git am omits any text between the first "---" and the diff, > it means that you can add a "---" on your actual commit message and > anything that follows will be discarded by git am, that way you can > maintain your history on your commit message which is way less tedious > than manually editing patches. > > So the second "---" from Tuomas patch is actually the one generated by > git format-patch but that gets discarded by git am just like any other > text so it causes no harm when other apply the patches. > > If this not the correct workflow and you have a better way to manage > this, I would love to know about it. One drawback of having --- in the commit message is that you can't cherry-pick but really need to use git-am for it to be stripped. I resorted to a scripted way of handling change logs: Per patch series I maintain a shell script that after git-format-patch essentially runs sed -i "/---/ r /dev/stdin" $OUTDIR/0001-*.patch <