Sync with 2.4.10

diff --cc Documentation/git.txt
index 2b39aa9f5153846884e4a280102e01f4aad357d1,a405e4f2e7094298873bcbc0578d41c407a5ff9c..b2d88688aa0fe02d08130aa0f4aac802c69787f0
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,17 -43,10 +43,18 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.4.9/git.html[documentation for release 2.4.9]
 +* link:v2.5.3/git.html[documentation for release 2.5.3]
 +
 +* release notes for
 +  link:RelNotes/2.5.3.txt[2.5.3],
 +  link:RelNotes/2.5.2.txt[2.5.2],
 +  link:RelNotes/2.5.1.txt[2.5.1],
 +  link:RelNotes/2.5.0.txt[2.5].
 +
+ * link:v2.4.10/git.html[documentation for release 2.4.10]
  
  * release notes for
+   link:RelNotes/2.4.10.txt[2.4.10],
    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],

diff --cc builtin/blame.c
Simple merge

diff --cc combine-diff.c
index 30c7eb6d3cddbdf17d6ca8ff3bc85267041d1669,5cae5fbd62180e08709d404cbf357adceb1d4d06..0f62f54b5ef4bb4ec81cff5aead2d6cd66da194e
--- 1/combine-diff.c
--- 2/combine-diff.c
+++ b/combine-diff.c
@@@ -419,8 -419,10 +419,10 @@@ static void combine_diff(const struct o
        state.num_parent = num_parent;
        state.n = n;
  
-       xdi_diff_outf(&parent_file, result_file, consume_line, &state,
-                     &xpp, &xecfg);
+       if (xdi_diff_outf(&parent_file, result_file, consume_line, &state,
+                         &xpp, &xecfg))
+               die("unable to generate combined diff for %s",
 -                  sha1_to_hex(parent));
++                  oid_to_hex(parent));
        free(parent_file.ptr);
  
        /* Assign line numbers for this parent.

diff --cc diff.c
Simple merge

diff --cc git-submodule.sh
Simple merge

diff --cc http.c
Simple merge

diff --cc ll-merge.c
Simple merge

diff --cc transport-helper.c
Simple merge

diff --cc transport.c
Simple merge