Sync with v2.5.4

diff --cc Documentation/git.txt
index b37cfcefcd1ffc29d7dfff1043bf8e90f4a5a260,1a262757dc9f73f39cadef45613046d09d824c9a..f9a7fb94c5becf0da161ed4167bfbd145c1af8b9
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,14 -43,10 +43,15 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.5.3/git.html[documentation for release 2.5.3]
 +* link:v2.6.0/git.html[documentation for release 2.6]
 +
 +* release notes for
 +  link:RelNotes/2.6.0.txt[2.6].
 +
+ * link:v2.5.4/git.html[documentation for release 2.5.4]
  
  * release notes for
+   link:RelNotes/2.5.4.txt[2.5.4],
    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],

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/rerere.c
index 12535c9b4f48cd196943c1914fefee7c47cecec2,be55e0d2a759168748b343b73391fff9d36c525a..88e1359ebcaad338d96dd942a5f88f54d6cce271
--- 1/builtin/rerere.c
--- 2/builtin/rerere.c
+++ b/builtin/rerere.c
@@@ -104,9 -105,10 +105,10 @@@ int cmd_rerere(int argc, const char **a
                for (i = 0; i < merge_rr.nr; i++) {
                        const char *path = merge_rr.items[i].string;
                        const char *name = (const char *)merge_rr.items[i].util;
-                       diff_two(rerere_path(name, "preimage"), path, path, path);
+                       if (diff_two(rerere_path(name, "preimage"), path, path, path))
+                               die("unable to generate diff for %s", name);
                }
 -      else
 +      } else
                usage_with_options(rerere_usage, options);
  
        string_list_clear(&merge_rr, 1);

diff --cc diff.c
Simple merge

diff --cc http.c
Simple merge

diff --cc transport-helper.c
Simple merge

diff --cc transport.c
Simple merge

diff --cc transport.h
Simple merge