emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Bernt Hansen <bernt@norang.ca>
To: "Erik L. Arneson" <public-dybbuk-qPb3x58jdZkAvxtiuMwx3w@plane.gmane.org>
Cc: public-emacs-orgmode-mXXj517/zsQ@plane.gmane.org
Subject: Re: [PATCH] Fix list assignments in ob-ocaml.el
Date: Fri, 16 Jul 2010 20:41:06 -0400	[thread overview]
Message-ID: <87d3unym71.fsf@gollum.intra.norang.ca> (raw)
In-Reply-To: m2iq4f8ag4.fsf@tyche.LNouv.com



dybbuk-qPb3x58jdZkAvxtiuMwx3w@public.gmane.org (Erik L. Arneson) writes:

> I'm sorry if this is not the correct format to send patches in, but it's
> my first patch.  Hope it looks good.

Comments like this should not be part of the commit message.  The
subject line (after [PATCH] is taken as the first line of the commit
message and the body of the email up to the --- separator is the body of
the commit message.

If you want to add extra detail for the mailing list which should not be
included in the commit message (like your text above) it should be put
between the --- and the diffstat.

You can find an example of a patch with extra detail which is not part
of the commit message here:

http://permalink.gmane.org/gmane.emacs.orgmode/26832

Text in the email between the --- separator and the diffstat is ignored
by 'git am' and 'git apply' so whomever is applying your patch won't
have to edit it manually to remove it.

git format-patch will create a patch file in the correct format
(assuming you've made your changes and committed them in your local
repository.  If it is a single patch

   git format-patch -1

will create a single file with the patch contents.  You can also use 
git send-email --annotate -1 
assuming you have set up the mailing list details in git.

I have the following in my .git/config for org-mode
,----[ .git/config ]
| [sendemail]
| 	to = emacs-orgmode@gnu.org
`----

so git send-email -1 --annotate creates a patch of the current HEAD
commit and drops me in an editor where I can insert extra details
between the --- separator and the diffstat.

The -1 (dash one) specifies how many commits to create patches for.
-3 would take the last 3 commits and create numbered files (or emails)
for submission to the mailing list.

HTH,
Bernt

PS. I know you said to ignore this patch but I thought I'd provide this
    detail anyway.  It's possible to apply a patch manually with fixups
    if it is in not in the correct format for git but it takes extra
    effort by the maintainer.  If you already have commits for your
    changes in git then creating patches in the correct format is easy.

  parent reply	other threads:[~2010-07-17  0:41 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-16 15:12 org-babel and OCaml - help? Erik L. Arneson
2010-07-16 19:59 ` [PATCH] Fix list assignments in ob-ocaml.el Erik L. Arneson
2010-07-16 20:59   ` Erik L. Arneson
2010-07-17 18:08     ` Eric Schulte
2010-07-17  0:41   ` Bernt Hansen [this message]
2010-07-16 22:30 ` org-babel and OCaml - help? Eric Schulte
2010-07-18 14:30   ` Erik L. Arneson
2010-07-18 17:07     ` Eric Schulte
2010-07-21 16:56       ` [babel] " Erik L. Arneson
2010-07-21 22:19         ` [babel] Re: org-babel and OCaml Eric Schulte

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87d3unym71.fsf@gollum.intra.norang.ca \
    --to=bernt@norang.ca \
    --cc=public-dybbuk-qPb3x58jdZkAvxtiuMwx3w@plane.gmane.org \
    --cc=public-emacs-orgmode-mXXj517/zsQ@plane.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).