diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-29 11:48:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-29 11:48:13 -0700 |
| commit | 1c08bf50cfcf924094eca56c2486a90e2bf1e6e2 (patch) | |
| tree | ea6108a20cddc7331f51ba4c1addcc7e9e0eaa21 | |
| parent | c54e6be75ae90e2be45c32f4d1949fff59ad7d9d (diff) | |
| parent | 65f13f20bccc71cf6599e9ad6b2ed0cc2312f416 (diff) | |
| download | git-1c08bf50cfcf924094eca56c2486a90e2bf1e6e2.tar.gz | |
Merge branch 'maint'
* maint:
Start 1.7.5.1 maintenance track
git-send-email: fix missing space in error message
Conflicts:
RelNotes
| -rw-r--r-- | Documentation/RelNotes/1.7.5.1.txt | 14 | ||||
| -rwxr-xr-x | git-send-email.perl | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.5.1.txt b/Documentation/RelNotes/1.7.5.1.txt new file mode 100644 index 0000000000..cfd9b2aa22 --- /dev/null +++ b/Documentation/RelNotes/1.7.5.1.txt @@ -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. diff --git a/git-send-email.perl b/git-send-email.perl index 76565de2ee..98ab33aae7 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1091,7 +1091,7 @@ X-Mailer: git-send-email $gitversion "VALUES: server=$smtp_server ", "encryption=$smtp_encryption ", "hello=$smtp_domain", - defined $smtp_server_port ? "port=$smtp_server_port" : ""; + defined $smtp_server_port ? " port=$smtp_server_port" : ""; } if (defined $smtp_authuser) { |