diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-07 01:14:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-07 01:14:46 (GMT) |
| commit | eb37527ab0b6e9ff1cbd01aa20a4dd6aa4150a96 (patch) | |
| tree | a5bd1509681216a52c9d8f856e727d7f339ebce2 /Documentation | |
| parent | ccce1e51e8cbc39e944302c2e34f15ef5cb39fce (diff) | |
| parent | 5453b83bdf92efbfe9e9aaa54d4c62ce48ced2f5 (diff) | |
| download | git-eb37527ab0b6e9ff1cbd01aa20a4dd6aa4150a96.zip git-eb37527ab0b6e9ff1cbd01aa20a4dd6aa4150a96.tar.gz git-eb37527ab0b6e9ff1cbd01aa20a4dd6aa4150a96.tar.bz2 | |
Merge branch 'xz/send-email-batch-size'
"git send-email" learned to overcome some SMTP server limitation
that does not allow many pieces of e-mails to be sent over a single
session.
* xz/send-email-batch-size:
send-email: --batch-size to work around some SMTP server limit
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 10 | ||||
| -rw-r--r-- | Documentation/git-send-email.txt | 15 |
2 files changed, 25 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 06898a7..d5c9c4c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2946,6 +2946,16 @@ sendemail.xmailer:: sendemail.signedoffcc (deprecated):: Deprecated alias for `sendemail.signedoffbycc`. +sendemail.smtpBatchSize:: + Number of messages to be sent per connection, after that a relogin + will happen. If the value is 0 or undefined, send all messages in + one connection. + See also the `--batch-size` option of linkgit:git-send-email[1]. + +sendemail.smtpReloginDelay:: + Seconds wait before reconnecting to smtp server. + See also the `--relogin-delay` option of linkgit:git-send-email[1]. + showbranch.default:: The default set of branches for linkgit:git-show-branch[1]. See linkgit:git-show-branch[1]. diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index bb23b02..bac9014 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -248,6 +248,21 @@ must be used for each option. commands and replies will be printed. Useful to debug TLS connection and authentication problems. +--batch-size=<num>:: + Some email servers (e.g. smtp.163.com) limit the number emails to be + sent per session (connection) and this will lead to a faliure when + sending many messages. With this option, send-email will disconnect after + sending $<num> messages and wait for a few seconds (see --relogin-delay) + and reconnect, to work around such a limit. You may want to + use some form of credential helper to avoid having to retype + your password every time this happens. Defaults to the + `sendemail.smtpBatchSize` configuration variable. + +--relogin-delay=<int>:: + Waiting $<int> seconds before reconnecting to SMTP server. Used together + with --batch-size option. Defaults to the `sendemail.smtpReloginDelay` + configuration variable. + Automating ~~~~~~~~~~ |