Merge branch 'jc/spht'

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index e38b7021b4d38c07bd794e59be0a5e0747a8b775..659215ac7221d5c8b6aa78bef2fcadce24ada8c3 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -113,8 +113,7 @@ The --cc option must be repeated for each user you want on the cc list.
        is not set, this will be prompted for.
 
 --suppress-from, --no-suppress-from::
-        If this is set, do not add the From: address to the cc: list, if it
-        shows up in a From: line.
+        If this is set, do not add the From: address to the cc: list.
         Default is the value of 'sendemail.suppressfrom' configuration value;
         if that is unspecified, default to --no-suppress-from.