···

       
1
       
1
       
-
       
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt

     

       
2
       
2
       
-
       
index 3db4eab4ba..39bc0e77c9 100644

     

       
1
       
1
       
+
       
diff --git a/Documentation/git-send-email.adoc b/Documentation/git-send-email.adoc

     

       
2
       
2
       
+
       
index 7f223db42d..7e46a07d31 100644

     

       
3
       
3
       
 
       
--- a/Documentation/git-send-email.adoc

     

       
4
       
4
       
 
       
+++ b/Documentation/git-send-email.adoc

     

       
5
       
5
       
-
       
@@ -220,9 +220,9 @@ a password is obtained using 'git-credential'.

     

       
5
       
5
       
+
       
@@ -177,7 +177,7 @@ Sending

     

       
6
       
6
       
+
       
 	The command will be executed in the shell if necessary.  Default

     

       
7
       
7
       
+
       
 	is the value of `sendemail.sendmailCmd`.  If unspecified, and if

     

       
8
       
8
       
+
       
 	--smtp-server is also unspecified, git-send-email will search

     

       
9
       
9
       
+
       
-	for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH.

     

       
10
       
10
       
+
       
+	for `sendmail` in $PATH.

     

       
11
       
11
       
+
       
 

     

       
12
       
12
       
+
       
 --smtp-encryption=<encryption>::

     

       
13
       
13
       
+
       
 	Specify in what way encrypting begins for the SMTP connection.

     

       
14
       
14
       
+
       
@@ -233,9 +233,9 @@ a password is obtained using 'git-credential'.

     

       
6
       
15
       
 
       
 --smtp-server=<host>::

     

       
7
       
16
       
 
       
 	If set, specifies the outgoing SMTP server to use (e.g.

     

       
8
       
17
       
 
       
 	`smtp.example.com` or a raw IP address).  If unspecified, and if

     
···

       
16
       
25
       
 
       
 For backward compatibility, this option can also specify a full pathname

     

       
17
       
26
       
 
       
 of a sendmail-like program instead; the program must support the `-i`

     

       
18
       
27
       
 
       
diff --git a/git-send-email.perl b/git-send-email.perl

     

       
19
       
19
       
-
       
index e65d969d0b..508d49483d 100755

     

       
28
       
28
       
+
       
index 798d59b84f..69c9cc2a7d 100755

     

       
20
       
29
       
 
       
--- a/git-send-email.perl

     

       
21
       
30
       
 
       
+++ b/git-send-email.perl

     

       
22
       
22
       
-
       
@@ -1066,8 +1066,7 @@ sub expand_one_alias {

     

       
31
       
31
       
+
       
@@ -1091,8 +1091,7 @@ sub expand_one_alias {

     

       
23
       
32
       
 
       
 }

     

       
24
       
33
       
 
       
 

     

       
25
       
34
       
 
       
 if (!defined $sendmail_cmd && !defined $smtp_server) {