summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge branch 'mm/push-simple-doc' into maintJunio C Hamano2016-03-101-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/git-push: document that 'simple' is the defaultmm/push-simple-docMatthieu Moy2016-02-231-0/+7
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-03-1091-482/+441
|\ \ \ \ \ \ \ \
| * | | | | | | | compat/mingw: brown paper bag fix for 50a6c8eJeff King2016-02-291-1/+1
| * | | | | | | | ewah: convert to REALLOC_ARRAY, etcJeff King2016-02-223-19/+8
| * | | | | | | | convert ewah/bitmap code to use xmallocJeff King2016-02-224-30/+11
| * | | | | | | | diff_populate_gitlink: use a strbufJeff King2016-02-221-8/+8
| * | | | | | | | transport_anonymize_url: use xstrfmtJeff King2016-02-221-5/+3
| * | | | | | | | git-compat-util: drop mempcpy compat codeJeff King2016-02-221-9/+0
| * | | | | | | | sequencer: simplify memory allocation of get_messageJeff King2016-02-221-19/+10
| * | | | | | | | test-path-utils: fix normalize_path_copy output buffer sizeJeff King2016-02-221-11/+4
| * | | | | | | | fetch-pack: simplify add_sought_entryJeff King2016-02-221-18/+9
| * | | | | | | | fast-import: simplify allocation in start_packfileJeff King2016-02-221-4/+1
| * | | | | | | | write_untracked_extension: use FLEX_ALLOC helperJeff King2016-02-221-5/+4
| * | | | | | | | prepare_{git,shell}_cmd: use argv_arrayJeff King2016-02-223-53/+39
| * | | | | | | | use st_add and st_mult for allocation size computationJeff King2016-02-2225-53/+56
| * | | | | | | | convert trivial cases to FLEX_ARRAY macrosJeff King2016-02-2217-82/+35
| * | | | | | | | use xmallocz to avoid size arithmeticJeff King2016-02-2215-25/+17
| * | | | | | | | convert trivial cases to ALLOC_ARRAYJeff King2016-02-2234-64/+75
| * | | | | | | | convert manual allocations to argv_arrayJeff King2016-02-227-76/+43
| * | | | | | | | argv-array: add detach functionJeff King2016-02-223-0/+19
| * | | | | | | | add helpers for allocating flex-array structsJeff King2016-02-221-0/+62
| * | | | | | | | harden REALLOC_ARRAY and xcalloc against size_t overflowJeff King2016-02-222-1/+5
| * | | | | | | | tree-diff: catch integer overflow in combine_diff_path allocationJeff King2016-02-192-4/+4
| * | | | | | | | add helpers for detecting size_t overflowJeff King2016-02-191-0/+34
| * | | | | | | | reflog_expire_cfg: NUL-terminate pattern fieldJeff King2016-02-191-5/+3
* | | | | | | | | Merge branch 'jk/more-comments-on-textconv' into maintJunio C Hamano2016-03-103-1/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff: clarify textconv interfacejk/more-comments-on-textconvJeff King2016-02-223-1/+24
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/no-diff-emit-common' into maintJunio C Hamano2016-03-104-57/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | xdiff: drop XDL_EMIT_COMMONjk/no-diff-emit-commonJeff King2016-02-222-19/+0
| * | | | | | | | | merge-tree: drop generate_common strategyJeff King2016-02-221-36/+2
| * | | | | | | | | merge-one-file: use empty blob for add/add baseJeff King2016-02-221-2/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jc/am-i-v-fix' into maintJunio C Hamano2016-03-103-9/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | am -i: fix "v"iewjc/am-i-v-fixJunio C Hamano2016-02-171-1/+1
| * | | | | | | | | pager: factor out a helper to prepare a child process to run the pagerJunio C Hamano2016-02-172-6/+14
| * | | | | | | | | pager: lose a separate argv[]Junio C Hamano2016-02-161-3/+1
* | | | | | | | | | Merge branch 'nd/git-common-dir-fix' into maintJunio C Hamano2016-03-102-1/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rev-parse: take prefix into account in --git-common-dirnd/git-common-dir-fixNguyễn Thái Ngọc Duy2016-02-122-1/+12
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano2016-03-105-33/+54
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | get_sha1: don't die() on bogus search stringsnd/dwim-wildcards-as-pathspecsJeff King2016-02-102-2/+12
| * | | | | | | | | | check_filename: tighten dwim-wildcard ambiguityJeff King2016-02-104-31/+42
| * | | | | | | | | | checkout: reorder check_filename conditionalJeff King2016-02-101-1/+1
* | | | | | | | | | | Merge branch 'jk/epipe-in-async' into maintJunio C Hamano2016-03-106-3/+25
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5504: handle expected output from SIGPIPE deathjk/epipe-in-asyncJeff King2016-02-251-1/+4
| * | | | | | | | | | | test_must_fail: report number of unexpected signalJeff King2016-02-251-1/+1
| * | | | | | | | | | | fetch-pack: ignore SIGPIPE in sideband demuxerJeff King2016-02-251-1/+5
| * | | | | | | | | | | write_or_die: handle EPIPE in async threadsJeff King2016-02-253-0/+15
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ps/config-error' into maintJunio C Hamano2016-03-1013-105/+159
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config: rename git_config_set_or_die to git_config_setps/config-errorPatrick Steinhardt2016-02-2210-67/+67
| * | | | | | | | | | | config: rename git_config_set to git_config_set_gentlyPatrick Steinhardt2016-02-227-39/+40