From: Johannes Sixt <redacted>
Signed-off-by: Johannes Sixt <redacted>
---
How about this as 6/5? I used the method described for this submission, so if
what you got is unusable, you know what to think of the suggestion ;)
I put this suggestion as approach #1 because I think it is superior to the
other two (iff it worked).
-- Hannes
Documentation/git-format-patch.txt | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -343,11 +343,21 @@ By default, Thunderbird will both wrap emails as well as flag
them as being 'format=flowed', both of which will make the
resulting email unusable by git.
-There are two different approaches. One approach is to configure
-Thunderbird to not mangle patches. The second approach is to use
+There are three different approaches: use an add-on to turn off line wraps,
+configure Thunderbird to not mangle patches, or use
an external editor to keep Thunderbird from mangling the patches.
-Approach #1 (configuration)
+Approach #1 (add-on)
+^^^^^^^^^^^^^^^^^^^^
+
+Install the Toggle Word Wrap add-on that is available from
+https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/
+It adds a menu entry "Enable Word Wrap" that you can tick off. Now you
+can compose the message as you otherwise do (cut + paste,
+'git format-patch' | 'git imap-send', etc), but you have to insert
+line breaks manually in any additional text that you type.
+
+Approach #2 (configuration)
^^^^^^^^^^^^^^^^^^^^^^^^^^^
Three steps:
@@ -374,7 +384,7 @@ After that is done, you should be able to compose email as you
otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc),
and the patches will not be mangled.
-Approach #2 (external editor)
+Approach #3 (external editor)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
The following Thunderbird extensions are needed: