diff options
| author |  Brian Gernhardt <brian@gernhardtsoftware.com> | 2010-04-10 10:53:56 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-04-10 13:01:23 -0700 |
| commit | 69cf7bfd131ae6246931459a1e6513d51f0b0119 (patch) | |
| tree | 4ba643f0f54bda125b357f450132865bc258b4d7 /Documentation | |
| parent | Document send-email --smtp-domain (diff) | |
| download | tgif-69cf7bfd131ae6246931459a1e6513d51f0b0119.tar.xz | |
send-email: Cleanup smtp-domain and add config
The way the code stored --smtp-domain was unlike its handling of other
similar options. Bring it in line with the others by:
- Renaming $mail_domain to $smtp_domain to match the command line
option. Also move its declaration from near the top of the file to
near other option variables.
- Removing $mail_domain_default. The variable was used once and only
served to move the default away from where it gets used.
- Adding a sendemail.smtpdomain config option. smtp-domain was the
only SMTP configuration option that couldn't be set in the user's
.gitconfig.
Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-send-email.txt | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index c80262bc37..0338d03d7e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1573,6 +1573,7 @@ sendemail.smtppass:: sendemail.suppresscc:: sendemail.suppressfrom:: sendemail.to:: +sendemail.smtpdomain:: sendemail.smtpserver:: sendemail.smtpserverport:: sendemail.smtpuser:: diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index f171471e64..288a4ec303 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -123,7 +123,8 @@ Sending Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server. Some servers require the FQDN to match your IP address. If not set, git send-email attempts - to determine your FQDN automatically. + to determine your FQDN automatically. Default is the value of + 'sendemail.smtpdomain'. --smtp-pass[=<password>]:: Password for SMTP-AUTH. The argument is optional: If no |