Merge branch 'maint-2.4' into maint-2.5
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Mar 2016 18:24:14 +0000 (11:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Mar 2016 18:24:14 +0000 (11:24 -0700)
commitc638f3e4d585008f630d7dd8bb902f44217455b3
tree1772afa44a4b0878c94824762684866b24a12ee1
parent24358560c3c0ab51c9ef8178d99f46711716f6c0
parent765428699a5381f113d19974720bc91b5bfeaf1d
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
Documentation/git.txt
builtin/pack-objects.c
builtin/rev-list.c
diff.h
git-compat-util.h
reachable.c
revision.c
tree-diff.c