git: 2.19.2 -> 2.21.0
This commit is contained in:
+6
-4
@@ -1,7 +1,8 @@
|
||||
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
|
||||
index 1afe9fc858..05dd7c3a90 100644
|
||||
--- a/Documentation/git-send-email.txt
|
||||
+++ b/Documentation/git-send-email.txt
|
||||
@@ -208,8 +208,7 @@ a password is obtained using 'git-credential'.
|
||||
@@ -215,8 +215,7 @@ 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
|
||||
@@ -9,14 +10,15 @@ diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
|
||||
- `/usr/sbin`, `/usr/lib` and $PATH if such program is
|
||||
+ option; the built-in default is to search in $PATH if such program is
|
||||
available, falling back to `localhost` otherwise.
|
||||
|
||||
|
||||
--smtp-server-port=<port>::
|
||||
diff --git a/git-send-email.perl b/git-send-email.perl
|
||||
index 8eb63b5a2f..74a61d8213 100755
|
||||
--- a/git-send-email.perl
|
||||
+++ b/git-send-email.perl
|
||||
@@ -944,8 +944,7 @@ if (defined $reply_to) {
|
||||
@@ -956,8 +956,7 @@ sub expand_one_alias {
|
||||
}
|
||||
|
||||
|
||||
if (!defined $smtp_server) {
|
||||
- my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail );
|
||||
- push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH};
|
||||
|
||||
Reference in New Issue
Block a user