Autogenerated HTML docs for v1.5.2.2-590-gf578

diff --git a/git-send-email.html b/git-send-email.html
index fe6048ae06ecf90f39c7b59e27b6818531844093..18759464f0de9cd146f1af488605f44dba7c019c 100644 (file)
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -349,12 +349,14 @@ enabled interface to provide the necessary information.</p>
 </p>\r
 </dd>\r
 <dt>\r
---no-signed-off-by-cc\r
+--signed-off-by-cc, --no-signed-off-by-cc\r
 </dt>\r
 <dd>\r
 <p>\r
-        Do not add emails found in Signed-off-by: or Cc: lines to the\r
+        If this is set, add emails found in Signed-off-by: or Cc: lines to the\r
         cc list.\r
+        Default is the value of <em>sendemail.signedoffbycc</em> configuration value;\r
+        if that is unspecified, default to --signed-off-by-cc.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -392,24 +394,26 @@ enabled interface to provide the necessary information.</p>
 </p>\r
 </dd>\r
 <dt>\r
---suppress-from\r
+--suppress-from, --no-suppress-from\r
 </dt>\r
 <dd>\r
 <p>\r
-        Do not add the From: address to the cc: list, if it shows up in a From:\r
-        line.\r
+        If this is set, do not add the From: address to the cc: list, if it\r
+        shows up in a From: line.\r
+        Default is the value of <em>sendemail.suppressfrom</em> configuration value;\r
+        if that is unspecified, default to --no-supress-from.\r
 </p>\r
 </dd>\r
 <dt>\r
---threaded, --no-threaded\r
+--thread, --no-thread\r
 </dt>\r
 <dd>\r
 <p>\r
         If this is set, the In-Reply-To header will be set on each email sent.\r
-        If disabled with "--no-threaded", no emails will have the In-Reply-To\r
+        If disabled with "--no-thread", no emails will have the In-Reply-To\r
         header set.\r
-        Default is the value of the <em>sendemail.threaded</em> configuration value;\r
-        if that is unspecified, default to --threaded.\r
+        Default is the value of the <em>sendemail.thread</em> configuration value;\r
+        if that is unspecified, default to --thread.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -508,7 +512,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 27-Jun-2007 07:14:34 UTC\r
+Last updated 28-Jun-2007 08:15:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-send-email.txt b/git-send-email.txt
index 1f5d57d42fa56b3bc2115006a760df6420a462b2..293686c31f9c80074d7b6d34fa303f56e19d8113 100644 (file)
--- a/git-send-email.txt
+++ b/git-send-email.txt
@@ -59,9 +59,11 @@ The --cc option must be repeated for each user you want on the cc list.
        Only necessary if --compose is also set.  If --compose
        is not set, this will be prompted for.
 
---no-signed-off-by-cc::
-       Do not add emails found in Signed-off-by: or Cc: lines to the
-       cc list.
+--signed-off-by-cc, --no-signed-off-by-cc::
+        If this is set, add emails found in Signed-off-by: or Cc: lines to the
+        cc list.
+        Default is the value of 'sendemail.signedoffbycc' configuration value;
+        if that is unspecified, default to --signed-off-by-cc.
 
 --quiet::
        Make git-send-email less verbose.  One line per email should be
@@ -82,16 +84,18 @@ The --cc option must be repeated for each user you want on the cc list.
        Only necessary if --compose is also set.  If --compose
        is not set, this will be prompted for.
 
---suppress-from::
-       Do not add the From: address to the cc: list, if it shows up in a From:
-       line.
+--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.
+        Default is the value of 'sendemail.suppressfrom' configuration value;
+        if that is unspecified, default to --no-supress-from.
 
---threaded, --no-threaded::
+--thread, --no-thread::
        If this is set, the In-Reply-To header will be set on each email sent.
-       If disabled with "--no-threaded", no emails will have the In-Reply-To
+       If disabled with "--no-thread", no emails will have the In-Reply-To
        header set.
-       Default is the value of the 'sendemail.threaded' configuration value;
-       if that is unspecified, default to --threaded.
+       Default is the value of the 'sendemail.thread' configuration value;
+       if that is unspecified, default to --thread.
 
 --dry-run::
        Do everything except actually send the emails.