summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'mm/push-simple-doc'Junio C Hamano2016-02-261-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/git-push: document that 'simple' is the defaultmm/push-simple-docMatthieu Moy2016-02-231-0/+7
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jg/credential-cache-chdir-to-sockdir'Junio C Hamano2016-02-262-15/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | credential-cache--daemon: change to the socket dir on startupjg/credential-cache-chdir-to-sockdirJon Griffiths2016-02-231-0/+9
| * | | | | | | | | credential-cache--daemon: disallow relative socket pathJon Griffiths2016-02-232-1/+4
| * | | | | | | | | credential-cache--daemon: refactor check_socket_directoryJon Griffiths2016-02-231-15/+13
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ps/config-error'Junio C Hamano2016-02-2613-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
| * | | | | | | | | compat: die when unable to set core.precomposeunicodePatrick Steinhardt2016-02-221-1/+2
| * | | | | | | | | sequencer: die on config error when saving replay optsPatrick Steinhardt2016-02-221-11/+11
| * | | | | | | | | init-db: die on config errors when initializing empty repoPatrick Steinhardt2016-02-221-10/+10
| * | | | | | | | | clone: die on config error in cmd_clonePatrick Steinhardt2016-02-221-4/+4
| * | | | | | | | | remote: die on config error when manipulating remotesPatrick Steinhardt2016-02-221-27/+12
| * | | | | | | | | remote: die on config error when setting/adding branchesPatrick Steinhardt2016-02-221-17/+9
| * | | | | | | | | remote: die on config error when setting URLPatrick Steinhardt2016-02-222-5/+15
| * | | | | | | | | submodule--helper: die on config error when cloning modulePatrick Steinhardt2016-02-221-2/+2
| * | | | | | | | | submodule: die on config error when linking modulesPatrick Steinhardt2016-02-221-5/+3
| * | | | | | | | | branch: die on config error when editing branch descriptionPatrick Steinhardt2016-02-221-3/+2
| * | | | | | | | | branch: die on config error when unsetting upstreamPatrick Steinhardt2016-02-222-2/+9
| * | | | | | | | | branch: report errors in tracking branch setupPatrick Steinhardt2016-02-223-16/+46
| * | | | | | | | | config: introduce set_or_die wrappersPatrick Steinhardt2016-02-162-0/+31
* | | | | | | | | | Merge branch 'mg/work-tree-tests'Junio C Hamano2016-02-263-0/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | tests: rename work-tree tests to *work-tree*mg/work-tree-testsMichael J Gruber2016-02-203-0/+0
* | | | | | | | | | | Merge branch 'ls/config-origin'Junio C Hamano2016-02-268-26/+237
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config: add '--show-origin' option to print the origin of a config valuels/config-originLars Schneider2016-02-223-5/+191
| * | | | | | | | | | | config: add 'origin_type' to config_source structLars Schneider2016-02-225-18/+40
| * | | | | | | | | | | rename git_config_from_buf to git_config_from_memLars Schneider2016-02-193-4/+4
| * | | | | | | | | | | t: do not hide Git's exit code in tests using 'nul_to_q'Lars Schneider2016-02-172-3/+6
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-2691-482/+441
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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