| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'dt/initial-ref-xn-commit-doc' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+12 |
|\ |
|
| * | refs: document transaction semanticsdt/initial-ref-xn-commit-doc | David Turner | 2016-02-25 | 1 | -0/+12 |
* | | Merge branch 'ps/plug-xdl-merge-leak' into maint | Junio C Hamano | 2016-03-10 | 1 | -2/+7 |
|\ \ |
|
| * | | xdiff/xmerge: fix memory leak in xdl_mergeps/plug-xdl-merge-leak | Patrick Steinhardt | 2016-02-23 | 1 | -2/+7 |
* | | | Merge branch 'ak/git-strip-extension-from-dashed-command' into maint | Junio C Hamano | 2016-03-10 | 2 | -15/+15 |
|\ \ \ |
|
| * | | | git.c: simplify stripping extension of a file in handle_builtin()ak/git-strip-extension-from-dashed-command | Alexander Kuleshov | 2016-02-21 | 2 | -15/+15 |
* | | | | Merge branch 'ak/extract-argv0-last-dir-sep' into maint | Junio C Hamano | 2016-03-10 | 1 | -4/+2 |
|\ \ \ \ |
|
| * | | | | exec_cmd.c: use find_last_dir_sep() for code simplificationak/extract-argv0-last-dir-sep | Alexander Kuleshov | 2016-02-19 | 1 | -4/+2 |
* | | | | | Merge branch 'jk/pack-idx-corruption-safety' into maint | Junio C Hamano | 2016-03-10 | 4 | -0/+207 |
|\ \ \ \ \ |
|
| * | | | | | sha1_file.c: mark strings for translation | Nguyễn Thái Ngọc Duy | 2016-02-27 | 1 | -3/+3 |
| * | | | | | use_pack: handle signed off_t overflow | Jeff King | 2016-02-25 | 2 | -1/+3 |
| * | | | | | nth_packed_object_offset: bounds-check extended offset | Jeff King | 2016-02-25 | 4 | -1/+27 |
| * | | | | | t5313: test bounds-checks of corrupted/malicious pack/idx files | Jeff King | 2016-02-25 | 1 | -0/+179 |
| |/ / / / |
|
* | | | | | Merge branch 'js/config-set-in-non-repository' into maint | Junio C Hamano | 2016-03-10 | 2 | -0/+14 |
|\ \ \ \ \ |
|
| * | | | | | git config: report when trying to modify a non-existing repo configjs/config-set-in-non-repository | Johannes Schindelin | 2016-02-25 | 2 | -0/+14 |
* | | | | | | Merge branch 'sb/submodule-module-list-fix' into maint | Junio C Hamano | 2016-03-10 | 2 | -8/+27 |
|\ \ \ \ \ \ |
|
| * | | | | | | submodule helper list: respect correct path prefixsb/submodule-module-list-fix | Stefan Beller | 2016-02-24 | 2 | -8/+27 |
| | |_|_|_|/
| |/| | | | |
|
* | | | | | | Merge branch 'jk/grep-binary-workaround-in-test' into maint | Junio C Hamano | 2016-03-10 | 2 | -13/+17 |
|\ \ \ \ \ \ |
|
| * | | | | | | t9200: avoid grep on non-ASCII datajk/grep-binary-workaround-in-test | John Keeping | 2016-02-23 | 1 | -1/+1 |
| * | | | | | | t8005: avoid grep on non-ASCII data | John Keeping | 2016-02-23 | 1 | -12/+16 |
| | |_|/ / /
| |/| | | | |
|
* | | | | | | Merge branch 'mm/push-simple-doc' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+7 |
|\ \ \ \ \ \ |
|
| * | | | | | | Documentation/git-push: document that 'simple' is the defaultmm/push-simple-doc | Matthieu Moy | 2016-02-23 | 1 | -0/+7 |
| |/ / / / / |
|
* | | | | | | Merge branch 'jk/tighten-alloc' into maint | Junio C Hamano | 2016-03-10 | 91 | -482/+441 |
|\ \ \ \ \ \ |
|
| * | | | | | | compat/mingw: brown paper bag fix for 50a6c8e | Jeff King | 2016-02-29 | 1 | -1/+1 |
| * | | | | | | ewah: convert to REALLOC_ARRAY, etc | Jeff King | 2016-02-22 | 3 | -19/+8 |
| * | | | | | | convert ewah/bitmap code to use xmalloc | Jeff King | 2016-02-22 | 4 | -30/+11 |
| * | | | | | | diff_populate_gitlink: use a strbuf | Jeff King | 2016-02-22 | 1 | -8/+8 |
| * | | | | | | transport_anonymize_url: use xstrfmt | Jeff King | 2016-02-22 | 1 | -5/+3 |
| * | | | | | | git-compat-util: drop mempcpy compat code | Jeff King | 2016-02-22 | 1 | -9/+0 |
| * | | | | | | sequencer: simplify memory allocation of get_message | Jeff King | 2016-02-22 | 1 | -19/+10 |
| * | | | | | | test-path-utils: fix normalize_path_copy output buffer size | Jeff King | 2016-02-22 | 1 | -11/+4 |
| * | | | | | | fetch-pack: simplify add_sought_entry | Jeff King | 2016-02-22 | 1 | -18/+9 |
| * | | | | | | fast-import: simplify allocation in start_packfile | Jeff King | 2016-02-22 | 1 | -4/+1 |
| * | | | | | | write_untracked_extension: use FLEX_ALLOC helper | Jeff King | 2016-02-22 | 1 | -5/+4 |
| * | | | | | | prepare_{git,shell}_cmd: use argv_array | Jeff King | 2016-02-22 | 3 | -53/+39 |
| * | | | | | | use st_add and st_mult for allocation size computation | Jeff King | 2016-02-22 | 25 | -53/+56 |
| * | | | | | | convert trivial cases to FLEX_ARRAY macros | Jeff King | 2016-02-22 | 17 | -82/+35 |
| * | | | | | | use xmallocz to avoid size arithmetic | Jeff King | 2016-02-22 | 15 | -25/+17 |
| * | | | | | | convert trivial cases to ALLOC_ARRAY | Jeff King | 2016-02-22 | 34 | -64/+75 |
| * | | | | | | convert manual allocations to argv_array | Jeff King | 2016-02-22 | 7 | -76/+43 |
| * | | | | | | argv-array: add detach function | Jeff King | 2016-02-22 | 3 | -0/+19 |
| * | | | | | | add helpers for allocating flex-array structs | Jeff King | 2016-02-22 | 1 | -0/+62 |
| * | | | | | | harden REALLOC_ARRAY and xcalloc against size_t overflow | Jeff King | 2016-02-22 | 2 | -1/+5 |
| * | | | | | | tree-diff: catch integer overflow in combine_diff_path allocation | Jeff King | 2016-02-19 | 2 | -4/+4 |
| * | | | | | | add helpers for detecting size_t overflow | Jeff King | 2016-02-19 | 1 | -0/+34 |
| * | | | | | | reflog_expire_cfg: NUL-terminate pattern field | Jeff King | 2016-02-19 | 1 | -5/+3 |
* | | | | | | | Merge branch 'jk/more-comments-on-textconv' into maint | Junio C Hamano | 2016-03-10 | 3 | -1/+24 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | diff: clarify textconv interfacejk/more-comments-on-textconv | Jeff King | 2016-02-22 | 3 | -1/+24 |
| | |/ / / / /
| |/| | | | | |
|
* | | | | | | | Merge branch 'jk/no-diff-emit-common' into maint | Junio C Hamano | 2016-03-10 | 4 | -57/+3 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | xdiff: drop XDL_EMIT_COMMONjk/no-diff-emit-common | Jeff King | 2016-02-22 | 2 | -19/+0 |