aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-13 13:28:56 -0800
committerJunio C Hamano <gitster@pobox.com>2017-12-13 13:28:56 -0800
commit577051bca44077b29f625cf14cac9360b2d11be9 (patch)
tree14219c4fd8da5174bff23670c3e764851c57105f /Documentation
parentd22512e0191dfceec72fadc6f2ad3690d4f9ca56 (diff)
parent1ab2fd4f397d8891f5345f876d42ab360859bcca (diff)
downloadgit-577051bca44077b29f625cf14cac9360b2d11be9.tar.gz
git-577051bca44077b29f625cf14cac9360b2d11be9.tar.xz
Merge branch 'fk/sendmail-from-path'
"git send-email" tries to see if the sendmail program is available in /usr/lib and /usr/sbin; extend the list of locations to be checked to also include directories on $PATH. * fk/sendmail-from-path: git-send-email: honor $PATH for sendmail binary
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-send-email.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index bac9014ac..8060ea35c 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -203,9 +203,9 @@ a password is obtained using 'git-credential'.
specify a full pathname of a sendmail-like program instead;
the program must support the `-i` option. Default value can
be specified by the `sendemail.smtpServer` configuration
- option; the built-in default is `/usr/sbin/sendmail` or
- `/usr/lib/sendmail` if such program is available, or
- `localhost` otherwise.
+ option; the built-in default is to search for `sendmail` in
+ `/usr/sbin`, `/usr/lib` and $PATH if such program is
+ available, falling back to `localhost` otherwise.
--smtp-server-port=<port>::
Specifies a port different from the default port (SMTP