aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-17 11:24:14 -0700
committerJunio C Hamano <gitster@pobox.com>2016-03-17 11:24:14 -0700
commitc638f3e4d585008f630d7dd8bb902f44217455b3 (patch)
tree1772afa44a4b0878c94824762684866b24a12ee1 /Documentation/git.txt
parent24358560c3c0ab51c9ef8178d99f46711716f6c0 (diff)
parent765428699a5381f113d19974720bc91b5bfeaf1d (diff)
downloadgit-c638f3e4d585008f630d7dd8bb902f44217455b3.tar.gz
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
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r--Documentation/git.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 1a262757dc..5449d7b35c 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -52,9 +52,10 @@ Documentation for older releases are available here:
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],