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 /git-send-email.perl | |
| parent | t/test-lib.sh: minor readability improvements (diff) | |
| parent | Start 1.7.5.1 maintenance track (diff) | |
| download | git-1c08bf50cfcf924094eca56c2486a90e2bf1e6e2.tar.gz git-1c08bf50cfcf924094eca56c2486a90e2bf1e6e2.zip | |
Merge branch 'maint'
* maint:
Start 1.7.5.1 maintenance track
git-send-email: fix missing space in error message
Conflicts:
RelNotes
Diffstat (limited to 'git-send-email.perl')
| -rwxr-xr-x | git-send-email.perl | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |