From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Mar 2016 18:24:14 +0000 (-0700)
Subject: Merge branch 'maint-2.4' into maint-2.5
X-Git-Tag: v2.5.5~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c638f3e4d585008f630d7dd8bb902f44217455b3;p=thirdparty%2Fgit.git

Merge branch 'maint-2.4' into maint-2.5

* maint-2.4:
  Git 2.4.11
  list-objects: pass full pathname to callbacks
  list-objects: drop name_path entirely
  list-objects: convert name_path to a strbuf
  show_object_with_name: simplify by using path_name()
  http-push: stop using name_path
  tree-diff: catch integer overflow in combine_diff_path allocation
  add helpers for detecting size_t overflow
---

c638f3e4d585008f630d7dd8bb902f44217455b3
diff --cc Documentation/git.txt
index 1a262757dc,889fa51f90..5449d7b35c
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,18 -43,10 +43,19 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* 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],
 +  link:RelNotes/2.5.0.txt[2.5].
 +
- * link:v2.4.10/git.html[documentation for release 2.4.10]
+ * link:v2.4.11/git.html[documentation for release 2.4.11]
  
  * release notes for
+   link:RelNotes/2.4.11.txt[2.4.11],
    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],