From 967ab8efd7f294c05b57db600c4e548d7c4f8b2f Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Thu, 14 Apr 2011 21:32:55 -0500 Subject: [PATCH] Documentation: publicize KMail hints for sending patches inline These hints are in git's private SubmittingPatches document but a wider audience might be interested. Move them to the "git format-patch" manpage. I'm not sure what gotchas these hints are meant to work around. They might be completely false. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/SubmittingPatches | 22 ++-------------------- Documentation/git-format-patch.txt | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 7908119f18..e9d8c3f6c1 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -413,8 +413,8 @@ that or Gentoo did it.) So you need to set the it. -Thunderbird ------------ +Thunderbird, KMail +------------------ See the MUA-SPECIFIC HINTS section of git-format-patch(1). @@ -433,24 +433,6 @@ message in raw form before using '|' to run the pipe can work this problem around. -KMail ------ - -This should help you to submit patches inline using KMail. - -1) Prepare the patch as a text file. - -2) Click on New Mail. - -3) Go under "Options" in the Composer window and be sure that -"Word wrap" is not set. - -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. - - Gmail ----- diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 627f381331..04e0f02d8e 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -415,6 +415,22 @@ There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor. +KMail +~~~~~ +This should help you to submit patches inline using KMail. + +1. Prepare the patch as a text file. + +2. Click on New Mail. + +3. Go under "Options" in the Composer window and be sure that + "Word wrap" is not set. + +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. + EXAMPLES --------