Mention -m as an abbreviation for --merge

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 08a023ea9262f2c1b4915fd5dcd09a29e1e4f6ab..8231286e09eb462d86679569f6911767b00deaf4 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -88,7 +88,7 @@ The --cc option must be repeated for each user you want on the cc list.
         If this is set, do not add the From: address to the cc: list, if it
         shows up in a From: line.
         Default is the value of 'sendemail.suppressfrom' configuration value;
-        if that is unspecified, default to --no-supress-from.
+        if that is unspecified, default to --no-suppress-from.
 
 --thread, --no-thread::
        If this is set, the In-Reply-To header will be set on each email sent.