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 <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 7908119f18491199e0f7182896160d301e7c5736..e9d8c3f6c1cccd40472946a341ea1ecab15b5b5c 100644 (file)
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -413,8 +413,8 @@ that or Gentoo did it.) So you need to set the
 it.
 
 
 it.
 
 

-Thunderbird
------------
+Thunderbird, KMail
+------------------

 
 See the MUA-SPECIFIC HINTS section of git-format-patch(1).
 
 
 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.
 
 
 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
 -----
 
 Gmail
 -----
 

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 627f3813310057c03a93b48cfe93ba85746c15d9..04e0f02d8ebc6d34e79883eec5fda5794178d9ee 100644 (file)
--- 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.
 
 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
 --------
 
 EXAMPLES
 --------