Merge branch 'rs/wt-status-cleanup'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 06898a7498f47d2e935e330ffbd34467b6bd8f07..d5c9c4cab60531d178d5c11d623a5c3f1036a0d0 100644 (file)
--- 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].