From: Jonathan Nieder <jrnieder@gmail.com>
To: "Rüdiger Sonderfeld" <ruediger@c-plusplus.de>
Cc: git@vger.kernel.org, davidk@lysator.liu.se,
Sergei Organov <osv@javad.com>, Kevin Ryde <user42@zip.com.au>,
Michele Ballabio <barra_cuda@katamail.com>
Subject: Sending patches with KMail (Re: [PATCH] git-blame.el: Fix compilation warnings.)
Date: Fri, 13 Jan 2012 17:31:58 -0600 [thread overview]
Message-ID: <20120113233158.GD7343@burratino> (raw)
In-Reply-To: <2304907.sEfEeC6Eon@descartes>
Hi,
Rüdiger Sonderfeld wrote:
> On Thursday 12 January 2012 10:26:41 Jonathan Nieder wrote:
>> These lines should be left out [*].
>
> Sorry, I wasn't sure whether to remove them or not. I followed the description
> in git-format-patch(1) on how to send patches with kmail. I'll remove them in
> the future. Thanks for the advice.
Oh, thanks for the pointer. How about something like this?
The hints at [1] might also be useful, in case you would like to try
and consider improving the manpage to document them if they work.
-- >8 --
Subject: Documentation/format-patch: mention removal of in-body headers for KMail
The opening "From " line and following lines in "git format-patch"
From 13c41b41b832d41680ccd33a2422ef8217965566 Mon Sep 17 00:00:00 2001
From: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri, 13 Jan 2012 17:22:41 -0600
are for your mailer and should be omitted except for fields that
differ from the mail header when reading your patch into an email
body. Otherwise "git am" thinks these lines are part of the commit
message when trying to reproduce the resulting patch from an mbox
automatically. Add a reminder in this direction to the KMail recipe.
Suggested-by: Rüdiger Sonderfeld <ruediger@c-plusplus.de>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
[1] http://thread.gmane.org/gmane.comp.version-control.git/171580/focus=171720
Documentation/git-format-patch.txt | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 6ea9be77..5e1d6d2c 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -462,8 +462,10 @@ This should help you to submit patches inline using KMail.
4. Use Message -> Insert file... and insert the patch.
-5. Back in the compose window: add whatever other text you wish to the
- message, complete the addressing and subject fields, and press send.
+5. Back in the compose window: remove the "`From $SHA1 $magic_timestamp`"
+ marker and unwanted in-body headers, add whatever other text you wish
+ to the message, complete the addressing and subject fields, and
+ press send.
EXAMPLES
--
1.7.8.3
next prev parent reply other threads:[~2012-01-13 23:32 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-12 15:44 [PATCH] git-blame.el: Fix compilation warnings Rüdiger Sonderfeld
2012-01-12 16:26 ` Jonathan Nieder
2012-01-12 17:08 ` Rüdiger Sonderfeld
2012-01-13 23:31 ` Jonathan Nieder [this message]
2012-01-14 0:59 ` Sending patches with KMail (Re: [PATCH] git-blame.el: Fix compilation warnings.) Junio C Hamano
2012-01-14 18:31 ` Sending patches with KMail Jonathan Nieder
2012-01-14 18:34 ` Jonathan Nieder
2012-01-15 2:14 ` Junio C Hamano
2012-01-14 19:18 ` Sending patches with KMail (Re: [PATCH] git-blame.el: Fix compilation warnings.) Rüdiger Sonderfeld
2012-06-10 7:38 ` [PATCH] git-blame.el: use mapc instead of mapcar Jonathan Nieder
2012-06-10 11:58 ` [PATCH 1/3] git-blame.el: Do not use goto-line in lisp code Lawrence Mitchell
2012-06-10 11:58 ` [PATCH 2/3] git-blame.el: Use with-current-buffer where appropriate Lawrence Mitchell
2012-06-10 11:58 ` [PATCH 3/3] git-blame.el: Do not use bare 0 to mean (point-min) Lawrence Mitchell
2012-06-14 5:08 ` [PATCH 1/3] git-blame.el: Do not use goto-line in lisp code Jonathan Nieder
2012-06-14 9:14 ` Lawrence Mitchell
2012-06-14 9:37 ` [PATCH v2 " Lawrence Mitchell
2012-06-14 9:37 ` [PATCH v2 2/3] git-blame.el: Use with-current-buffer where appropriate Lawrence Mitchell
2012-06-14 9:38 ` [PATCH v2 3/3] git-blame.el: Do not use bare 0 to mean (point-min) Lawrence Mitchell
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120113233158.GD7343@burratino \
--to=jrnieder@gmail.com \
--cc=barra_cuda@katamail.com \
--cc=davidk@lysator.liu.se \
--cc=git@vger.kernel.org \
--cc=osv@javad.com \
--cc=ruediger@c-plusplus.de \
--cc=user42@zip.com.au \
/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.
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 NNTP newsgroup(s).