From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: contrib/README Date: Thu, 1 Jul 2010 14:27:38 +0200 Message-ID: References: <3619.1277974892@maps> <3855.1277975432@maps> <4027.1277976169@maps> <4663.1277986531@maps> Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from [140.186.70.92] (port=60059 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUIrr-0001CW-MV for emacs-orgmode@gnu.org; Thu, 01 Jul 2010 08:27:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUIrq-0004BH-6s for emacs-orgmode@gnu.org; Thu, 01 Jul 2010 08:27:47 -0400 Received: from mail-fx0-f41.google.com ([209.85.161.41]:60834) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUIrq-0004BA-1U for emacs-orgmode@gnu.org; Thu, 01 Jul 2010 08:27:46 -0400 Received: by fxm17 with SMTP id 17so1390586fxm.0 for ; Thu, 01 Jul 2010 05:27:44 -0700 (PDT) In-Reply-To: <4663.1277986531@maps> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Stephen Eglen Cc: emacs-orgmode@gnu.org On Jul 1, 2010, at 2:15 PM, Stephen Eglen wrote: > >> Please that we no longer use ChangeLog, but that we place entries >> with similar syntax into the commit message and then later >> build ChangeLog from that. >> >> If you look at the final commit, you'll see what I mean. > > I see - neat idea about the ChangeLog. Can you still use 'C-x 4 a' > from > a buffer to help build the ChangeLog entries though which ultimately > go > in the commit messages? What's the workflow (sorry if this has been > discussed before)? The workflow is to use magit, and the to press `C' at a snippet in the magit status buffer. This is equivalent to `C-x 4 a'. Please make sure that - the commit message still has a single first line, followed by a newline - after the newline, the ChangeLog entry should be placed, first line starting with a star, and no empty lines inside the block. - After the ChangeLog block, and another empty line, you can add any free-form explanations you want - they will be discarded when building the ChangeLog file. See also http://orgmode.org/worg/org-contribute.php#sec-4 HTH - Carsten