mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Start 1.7.5.1 maintenance track
  git-send-email: fix missing space in error message

Conflicts:
	RelNotes
This commit is contained in:
Junio C Hamano
2011-04-29 11:48:13 -07:00
parent c54e6be75a 65f13f20bc
commit 1c08bf50cf
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/RelNotes/1.7.5.1.txt Normal file
View File

@ -0,0 +1,14 @@
Git v1.7.5.1 Release Notes
==========================
Fixes since v1.7.5
------------------
* The "--date=relative" output format used to say "X years, 12 months"
when it should have said "X+1 years".
* An error message from "git send-email" to diagnose a broken SMTP
connection configuration lacked a space between "hello=<smtp-domain>"
and "port=<smtp-server-port>".
And other minor fixes and documentation updates.

2
git-send-email.perl
View File

@ -1091,7 +1091,7 @@ X-Mailer: git-send-email $gitversion
"VALUES: server=$smtp_server ", "VALUES: server=$smtp_server ",
"encryption=$smtp_encryption ", "encryption=$smtp_encryption ",
"hello=$smtp_domain", "hello=$smtp_domain",
defined $smtp_server_port ? "port=$smtp_server_port" : ""; defined $smtp_server_port ? " port=$smtp_server_port" : "";
} }
if (defined $smtp_authuser) { if (defined $smtp_authuser) {