Merge branch 'sb/maint-1.6.0-add-config-fix'

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index e7cb0e6c71e84c896ecf2d232c906c5cb0de6b08..9902da43c7c24342346f2fcdce86c8db9411b28d 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -165,7 +165,7 @@ Automating
        Output of this command must be single email address per line.
        Default is the value of 'sendemail.cccmd' configuration value.
 
---[no-]chain-reply-to=<identifier>::
+--[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
@@ -214,7 +214,8 @@ specified, as well as 'body' if --no-signed-off-cc is specified.
 --[no-]thread::
        If this is set, the In-Reply-To header will be set on each email sent.
        If disabled with "--no-thread", no emails will have the In-Reply-To
-       header set. Default is the value of the 'sendemail.thread' configuration
+       header set, unless specified with --in-reply-to.
+       Default is the value of the 'sendemail.thread' configuration
        value; if that is unspecified, default to --thread.