summaryrefslogtreecommitdiff
path: root/Documentation/git-send-email.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-12 16:23:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-12 16:23:43 (GMT)
commit95a877a34c3838a92a99794ebc3b082f6f525899 (patch)
treebcd7961c64ef7d319e75b7dc320235881efd1e69 /Documentation/git-send-email.txt
parenta1b5b371994beb044053da22ec4a9607630a83a2 (diff)
parent0fd41f2d66fdb7c8125f341c72f075aca045017f (diff)
downloadgit-95a877a34c3838a92a99794ebc3b082f6f525899.zip
git-95a877a34c3838a92a99794ebc3b082f6f525899.tar.gz
git-95a877a34c3838a92a99794ebc3b082f6f525899.tar.bz2
Merge branch 'mh/maint-fix-send-email-threaded' into mh/fix-send-email-threaded
* mh/maint-fix-send-email-threaded: doc/send-email: clarify the behavior of --in-reply-to with --no-thread send-email: fix non-threaded mails add a test for git-send-email for non-threaded mails Conflicts: git-send-email.perl t/t9001-send-email.sh
Diffstat (limited to 'Documentation/git-send-email.txt')
-rw-r--r--Documentation/git-send-email.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index e7cb0e6..9902da4 100644
--- 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.