aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-10-15 10:29:32 -0700
committerJunio C Hamano <gitster@pobox.com>2025-10-15 10:29:32 -0700
commit51195bdab2df4983bb6ddfa49c33b3dd5e4a8430 (patch)
treec93587a5a182d2bb00ae263e2d3a95b104b6c8aa
parent9c22d96e568433ed56fbbe0cd25ec24d9e593031 (diff)
parent785628b173f167ddce96f12829de56588a850355 (diff)
downloadgit-51195bdab2df4983bb6ddfa49c33b3dd5e4a8430.tar.gz
Merge branch 'js/doc-sending-patch-via-thunderbird' into maint-2.51
Doc update. * js/doc-sending-patch-via-thunderbird: doc/format-patch: adjust Thunderbird MUA hint to new add-on
-rw-r--r--Documentation/git-format-patch.adoc12
1 files changed, 9 insertions, 3 deletions
diff --git a/Documentation/git-format-patch.adoc b/Documentation/git-format-patch.adoc
index a8b53db9a6..a9cf37182e 100644
--- a/Documentation/git-format-patch.adoc
+++ b/Documentation/git-format-patch.adoc
@@ -587,13 +587,19 @@ an external editor to keep Thunderbird from mangling the patches.
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" in the composer's "Options" menu
+Install the Toggle Line Wrap add-on that is available from
+https://addons.thunderbird.net/thunderbird/addon/toggle-line-wrap
+It adds a button "Line Wrap" to the composer's toolbar
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 text that you type.
+As a bonus feature, the add-on can detect patch text in the composer
+and warns when line wrapping has not yet been turned off.
+
+The add-on requires a few tweaks of the advanced configuration
+(about:config). These are listed on the download page.
+
Approach #2 (configuration)
^^^^^^^^^^^^^^^^^^^^^^^^^^^
Three steps: