diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-08-17 17:02:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-17 17:02:41 -0700 |
| commit | a00bda2b2fa5e6a8b224734cf72bb0601cd65b8a (patch) | |
| tree | 07f392959e2fe6511f298998671facbd0d8be73c /Documentation/config | |
| parent | Merge branch 'ps/ref-transaction-hook' (diff) | |
| parent | git-send-email: die if sendmail.* config is set (diff) | |
| download | tgif-a00bda2b2fa5e6a8b224734cf72bb0601cd65b8a.tar.xz | |
Merge branch 'dd/send-email-config'
Stop when "sendmail.*" configuration variables are defined, which
could be a mistaken attempt to define "sendemail.*" variables.
* dd/send-email-config:
git-send-email: die if sendmail.* config is set
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/sendemail.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config/sendemail.txt b/Documentation/config/sendemail.txt index 0006faf800..cbc5af42fd 100644 --- a/Documentation/config/sendemail.txt +++ b/Documentation/config/sendemail.txt @@ -61,3 +61,8 @@ sendemail.smtpBatchSize:: sendemail.smtpReloginDelay:: Seconds wait before reconnecting to smtp server. See also the `--relogin-delay` option of linkgit:git-send-email[1]. + +sendemail.forbidSendmailVariables:: + To avoid common misconfiguration mistakes, linkgit:git-send-email[1] + will abort with a warning if any configuration options for "sendmail" + exist. Set this variable to bypass the check. |