[PATCH] Add -k kill keyword expansion option to git-cvsimport - revised

diff --git a/Documentation/git-send-email-script.txt b/Documentation/git-send-email-script.txt
index 97d5baed0587f7217bd70cbbe9aa813e72f77c2b..89f98bbf70a07138a0b9c92bccbfe595749bcb39 100644 (file)
--- a/Documentation/git-send-email-script.txt
+++ b/Documentation/git-send-email-script.txt
@@ -44,6 +44,19 @@ The options available are:
        to set this to a space.  For example
                --in-reply-to=" "
 
+   --chain-reply-to, --no-chain-reply-to
+       If this is set, each email will be sent as a reply to the previous
+       email sent.  If disabled with "--no-chain-reply-to", all emails after
+       the first will be sent as replies to the first email sent.  When using
+       this, it is recommended that the first file given be an overview of the
+       entire patch series.
+       Default is --chain-reply-to
+
+   --smtp-server
+       If set, specifies the outgoing SMTP server to use.  Defaults to
+       localhost.
+
+
 Author
 ------
 Written by Ryan Anderson <ryan@michonline.com>