diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:42:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:42:50 -0800 |
| commit | 0c7cc135c52b7c573710f247fc55ea1bf677f1bc (patch) | |
| tree | f311a31e2cf038a7039aeb61049ea695b781366e /Documentation/git-send-email.txt | |
| parent | a689faeb5850174edfbbb0a502ef7eee8cd06d76 (diff) | |
| parent | c89e32414516e906520e9bdd809560971eb52ef5 (diff) | |
| download | git-0c7cc135c52b7c573710f247fc55ea1bf677f1bc.tar.gz | |
Merge branch 'fc/send-email-envelope'
Diffstat (limited to 'Documentation/git-send-email.txt')
| -rw-r--r-- | Documentation/git-send-email.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index c85d7f4385..8c482f40b9 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -108,9 +108,10 @@ Sending --envelope-sender=<address>:: Specify the envelope sender used to send the emails. This is useful if your default address is not the address that is - subscribed to a list. If you use the sendmail binary, you must have - suitable privileges for the -f parameter. Default is the value of - the 'sendemail.envelopesender' configuration variable; if that is + subscribed to a list. In order to use the 'From' address, set the + value to "auto". If you use the sendmail binary, you must have + suitable privileges for the -f parameter. Default is the value of the + 'sendemail.envelopesender' configuration variable; if that is unspecified, choosing the envelope sender is left to your MTA. --smtp-encryption=<encryption>:: |