Sync with 2.3.10

diff --cc Documentation/git.txt
index 97d9fb41b2b41555732cc349da043f7ce3a2f24a,c06b9239698480ababd317c1e1b49d999bc4f988..5826bd97711d61ba1dec70052245ee0050eb1c6c
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,23 -43,10 +43,24 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.3.9/git.html[documentation for release 2.3.9]
 +* link:v2.4.9/git.html[documentation for release 2.4.9]
 +
 +* release notes for
 +  link:RelNotes/2.4.9.txt[2.4.9],
 +  link:RelNotes/2.4.8.txt[2.4.8],
 +  link:RelNotes/2.4.7.txt[2.4.7],
 +  link:RelNotes/2.4.6.txt[2.4.6],
 +  link:RelNotes/2.4.5.txt[2.4.5],
 +  link:RelNotes/2.4.4.txt[2.4.4],
 +  link:RelNotes/2.4.3.txt[2.4.3],
 +  link:RelNotes/2.4.2.txt[2.4.2],
 +  link:RelNotes/2.4.1.txt[2.4.1],
 +  link:RelNotes/2.4.0.txt[2.4].
 +
+ * link:v2.3.10/git.html[documentation for release 2.3.10]
  
  * release notes for
+   link:RelNotes/2.3.10.txt[2.3.10],
    link:RelNotes/2.3.9.txt[2.3.9],
    link:RelNotes/2.3.8.txt[2.3.8],
    link:RelNotes/2.3.7.txt[2.3.7],

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/merge-file.c
Simple merge

diff --cc builtin/rerere.c
Simple merge

diff --cc combine-diff.c
Simple merge

diff --cc connect.c
index c0144d859ae4275860df464f73a688c649d092fe,bd4b50ea153c06089cbc8828b5369729b009eab4..27a706f76621621a25b7e58188e5d1da9b9a2ccd
--- 1/connect.c
--- 2/connect.c
+++ b/connect.c
@@@ -724,9 -727,10 +727,10 @@@ struct child_process *git_connect(int f
                conn->in = conn->out = -1;
                if (protocol == PROTO_SSH) {
                        const char *ssh;
 -                      int putty;
 +                      int putty, tortoiseplink = 0;
                        char *ssh_host = hostandport;
                        const char *port = NULL;
+                       transport_check_allowed("ssh");
                        get_host_and_port(&ssh_host, &port);
  
                        if (!port)

diff --cc diff.c
Simple merge

diff --cc http.c
index 9a7e0892e479a977f575a549699bc76e969634be,00e3fc80e8161080549db26afd68e341989af453..9448c50f0f9ae159aa73feae6d980335265c168f
--- 1/http.c
--- 2/http.c
+++ b/http.c
@@@ -8,7 -8,7 +8,8 @@@
  #include "credential.h"
  #include "version.h"
  #include "pkt-line.h"
 +#include "gettext.h"
+ #include "transport.h"
  
  int active_requests;
  int http_is_verbose;

diff --cc line-log.c
Simple merge

diff --cc transport-helper.c
Simple merge

diff --cc transport.c
Simple merge

diff --cc transport.h
Simple merge