From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SevM1-0000W8-1l for qemu-devel@nongnu.org; Wed, 13 Jun 2012 17:43:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SevLz-00035B-AQ for qemu-devel@nongnu.org; Wed, 13 Jun 2012 17:43:52 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.145]:58744) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SevLz-00034a-6N for qemu-devel@nongnu.org; Wed, 13 Jun 2012 17:43:51 -0400 Received: from /spool/local by e5.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 13 Jun 2012 17:43:47 -0400 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 1CD836E804D for ; Wed, 13 Jun 2012 17:43:45 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5DLhi2G168184 for ; Wed, 13 Jun 2012 17:43:45 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q5E3EaLR023197 for ; Wed, 13 Jun 2012 23:14:37 -0400 Message-ID: <4FD9098F.40908@linux.vnet.ibm.com> Date: Wed, 13 Jun 2012 17:43:43 -0400 From: Corey Bryant MIME-Version: 1.0 References: <1339170179-2554-1-git-send-email-coreyb@linux.vnet.ibm.com> <1339170179-2554-2-git-send-email-coreyb@linux.vnet.ibm.com> <20120613164258.6213776a@doriath.home> <4FD8F55A.2030804@linux.vnet.ibm.com> <4FD8FAF6.5050302@redhat.com> In-Reply-To: <4FD8FAF6.5050302@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/4] qapi: Convert getfd and closefd List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, libvir-list@redhat.com, qemu-devel@nongnu.org, Luiz Capitulino On 06/13/2012 04:41 PM, Eric Blake wrote: > On 06/13/2012 02:17 PM, Corey Bryant wrote: >> >> >> On 06/13/2012 03:42 PM, Luiz Capitulino wrote: >>> On Fri, 8 Jun 2012 11:42:56 -0400 >>> Corey Bryant wrote: >>> >>>> v2: >>>> - Convert getfd and closefd to QAPI (lcapitulino@redhat.com) >>>> - Remove changes that returned fd from getfd (lcapitulino@redhat.com) >>>> - Wrap hmp_* functions around qmp_* functions (kwolf@redhat.com) >>>> - Move hmp_* functions to hmp.c (lcapitulino@redhat.com) >>>> - Drop .user_print lines (lcapitulino@redhat.com) >>>> - Use 'cmd' instead of 'cmd_new' for HMP (lcapitulino@redhat.com) >>>> - Change QMP command existance back to 0.14 (lcapitulino@redhat.com) >>> >>> Btw, having the changelog like this is not nice because it becomes part >>> of the history. It's better to move it after the '---' line, so that >>> git ignores it. >>> >> >> I see your point and I can do this in v3. But can I add text after the >> '---' line in the commit message via 'git commit' or do I have to >> manually edit the patches? > > I also like tracking my notes to self/reviewers in the commit message as > I do a rebase. 'git send-email' automatically adds --- at the end of > your commit message, so I personally end up using 'git send-email > --annotate' and manually move the --- line to occur before my separation > point. I think you can also stick --- in the middle of your commit > message at which point 'git am' will truncate from the first instance > when applying your email, without you having to edit things when > mailing, although I haven't tried it myself (at any rate, I have seen > patches from others with double --- lines, and assume that the doubled > line is a result of the literal --- line in their commit message). > > Supposedly, it is also possible to use 'git notes' coupled with > notes.rewrite* options in your .gitconfig to track your notes over a > rebase, as well as an undocumented option to 'git send-email' to have > your notes automatically included after a lone --- line, but that are of > git is woefully under-documented and probably has issues that need > fixing before turning it into a daily workflow. > Thanks for the tips! -- Regards, Corey