git/Documentation, branch v2.7.4Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.7.42016-03-17T18:32:13ZGit 2.7.42016-03-17T18:32:13ZJunio C Hamanogitster@pobox.com2016-03-17T18:32:13Zurn:sha1:937978e0f3e750d917768c77665d5f8cfbd802b6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with Git 2.6.62016-03-17T18:28:52ZJunio C Hamanogitster@pobox.com2016-03-17T18:28:52Zurn:sha1:8e9cc5f3e2899fc4cfaf0c1ee039fb2c6683c0a9
* maint-2.6:
Git 2.6.6
Git 2.5.5
Git 2.4.11
Git 2.6.62016-03-17T18:26:41ZJunio C Hamanogitster@pobox.com2016-03-17T17:56:06Zurn:sha1:e46579643d56162299b1756b70d418005351b256
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'maint-2.5' into maint-2.62016-03-17T18:26:18ZJunio C Hamanogitster@pobox.com2016-03-17T18:26:18Zurn:sha1:ce4d4e763c054788550625502553ced8810a7bce
* maint-2.5:
Git 2.5.5
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
Git 2.5.52016-03-17T18:24:59ZJunio C Hamanogitster@pobox.com2016-03-17T17:28:50Zurn:sha1:e568e563ade00bbb0937162f405fc160f253e224
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'maint-2.4' into maint-2.52016-03-17T18:24:14ZJunio C Hamanogitster@pobox.com2016-03-17T18:24:14Zurn:sha1:c638f3e4d585008f630d7dd8bb902f44217455b3
* 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
Git 2.4.112016-03-17T18:23:05ZJunio C Hamanogitster@pobox.com2016-03-17T17:00:44Zurn:sha1:765428699a5381f113d19974720bc91b5bfeaf1d
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 2.7.32016-03-10T19:14:08ZJunio C Hamanogitster@pobox.com2016-03-10T19:13:13Zurn:sha1:594730e980521310d88006d91f3f14ef5eff1e2b
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'mm/push-simple-doc' into maint2016-03-10T19:13:44ZJunio C Hamanogitster@pobox.com2016-03-10T19:13:44Zurn:sha1:d4e7b9bcb0ca9ef976b765b0daf29b4c1466db48
The documentation did not clearly state that the 'simple' mode is
now the default for "git push" when push.default configuration is
not set.
* mm/push-simple-doc:
Documentation/git-push: document that 'simple' is the default
Merge branch 'jk/tighten-alloc' into maint2016-03-10T19:13:43ZJunio C Hamanogitster@pobox.com2016-03-10T19:13:43Zurn:sha1:b7a6ec609ff10652541e7f716fcecf7865b94b23
* jk/tighten-alloc: (23 commits)
compat/mingw: brown paper bag fix for 50a6c8e
ewah: convert to REALLOC_ARRAY, etc
convert ewah/bitmap code to use xmalloc
diff_populate_gitlink: use a strbuf
transport_anonymize_url: use xstrfmt
git-compat-util: drop mempcpy compat code
sequencer: simplify memory allocation of get_message
test-path-utils: fix normalize_path_copy output buffer size
fetch-pack: simplify add_sought_entry
fast-import: simplify allocation in start_packfile
write_untracked_extension: use FLEX_ALLOC helper
prepare_{git,shell}_cmd: use argv_array
use st_add and st_mult for allocation size computation
convert trivial cases to FLEX_ARRAY macros
use xmallocz to avoid size arithmetic
convert trivial cases to ALLOC_ARRAY
convert manual allocations to argv_array
argv-array: add detach function
add helpers for allocating flex-array structs
harden REALLOC_ARRAY and xcalloc against size_t overflow
...