summaryrefslogtreecommitdiff
path: root/config.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/plug-leaks'Junio C Hamano2017-05-291-1/+4
|\
| * git_config_rename_section_in_file(): avoid resource leakJohannes Schindelin2017-05-081-1/+4
* | Merge branch 'js/larger-timestamps'Junio C Hamano2017-05-161-1/+1
|\ \ | |/ |/|
| * timestamp_t: a new data type for timestampsJohannes Schindelin2017-04-271-1/+1
* | Merge branch 'nd/conditional-config-in-early-config'Junio C Hamano2017-04-261-20/+42
|\ \
| * | config: correct file reading order in read_early_config()nd/conditional-config-in-early-configNguyễn Thái Ngọc Duy2017-04-191-14/+12
| * | config: handle conditional include when $GIT_DIR is not set upNguyễn Thái Ngọc Duy2017-04-171-8/+26
| * | config: prepare to pass more info in git_config_with_options()Nguyễn Thái Ngọc Duy2017-04-171-5/+11
| |/
* | Merge branch 'nd/conditional-config-include'Junio C Hamano2017-04-231-6/+6
|\ \
| * | config: resolve symlinks in conditional include's patternsnd/conditional-config-includeNguyễn Thái Ngọc Duy2017-04-141-3/+3
| * | path.c: and an option to call real_path() in expand_user_path()Nguyễn Thái Ngọc Duy2017-04-141-4/+4
* | | http.postbuffer: allow full range of ssize_t valuesdt/http-postbuffer-can-be-largeDavid Turner2017-04-131-0/+17
| |/ |/|
* | Merge branch 'nd/conditional-config-include'Junio C Hamano2017-03-211-0/+92
|\ \ | |/
| * config: add conditional includeNguyễn Thái Ngọc Duy2017-03-111-0/+92
* | Merge branch 'js/early-config'Junio C Hamano2017-03-171-0/+25
|\ \
| * | read_early_config(): really discover .git/Johannes Schindelin2017-03-141-19/+12
| * | read_early_config(): avoid .git/config hack when unneededJohannes Schindelin2017-03-141-2/+3
| * | setup: make read_early_config() reusableJohannes Schindelin2017-03-141-0/+31
| |/
* | Merge branch 'cc/split-index-config'Junio C Hamano2017-03-171-2/+40
|\ \
| * | config: add git_config_get_expiry() from gc.cChristian Couder2017-03-011-0/+13
| * | config: add git_config_get_max_percent_split_change()Christian Couder2017-03-011-0/+15
| * | config: add git_config_get_split_index()Christian Couder2017-03-011-0/+10
| * | config: mark an error message up for translationChristian Couder2017-03-011-2/+2
* | | Merge branch 'jk/parse-config-key-cleanup'Junio C Hamano2017-03-101-6/+9
|\ \ \
| * | | parse_config_key: allow matching single-level configJeff King2017-02-241-2/+6
| * | | parse_config_key: use skip_prefix instead of starts_withJeff King2017-02-241-4/+3
| * | | Merge branch 'nd/config-misc-fixes' into maintJunio C Hamano2017-01-311-5/+15
| |\ \ \
| * \ \ \ Merge branch 'jc/abbrev-autoscale-config' into maintJunio C Hamano2017-01-311-4/+10
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/config-case-cmdline-take-2'Junio C Hamano2017-03-101-97/+101
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | config: use git_config_parse_key() in git_config_parse_parameter()jc/config-case-cmdline-take-2Junio C Hamano2017-02-231-5/+9
| * | | | | config: move a few helper functions upJunio C Hamano2017-02-231-92/+92
* | | | | | refs: add option core.logAllRefUpdates = alwaysCornelius Weig2017-01-311-1/+6
* | | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-01-181-4/+4
|\ \ \ \ \ \
| * | | | | | submodules: load gitmodules file from commit sha1Brandon Williams2016-12-221-4/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'nd/config-misc-fixes'Junio C Hamano2017-01-101-5/+15
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | config.c: handle lock file in error case in git_config_rename_...nd/config-misc-fixesNguyễn Thái Ngọc Duy2016-12-221-1/+3
| * | | | | config.c: rename label unlock_and_outNguyễn Thái Ngọc Duy2016-12-201-2/+2
| * | | | | config.c: handle error case for fstat() callsNguyễn Thái Ngọc Duy2016-12-201-2/+10
| * | | | | Merge branch 'pc/occurred' into maintJunio C Hamano2016-07-061-1/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jc/abbrev-autoscale-config'Junio C Hamano2017-01-101-4/+10
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | config.abbrev: document the new default that auto-scalesjc/abbrev-autoscale-configJunio C Hamano2016-12-221-4/+10
| | |_|/ / | |/| | |
* | | | | compression: unify pack.compression configuration parsingjc/compression-configJunio C Hamano2016-11-151-0/+16
|/ / / /
* | | | get_short_sha1: make default disambiguation configurableJeff King2016-09-271-0/+3
* | | | Merge branch 'jk/setup-sequence-update'Junio C Hamano2016-09-211-4/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | config: only read .git/config from configured reposJeff King2016-09-131-1/+1
| * | | pager: stop loading git_default_config()Jeff King2016-09-131-3/+0
* | | | i18n: simplify numeric error reportingja/i18nJean-Noel Avila2016-08-241-28/+16
* | | | i18n: config: unfold error messages marked for translationVasco Almeida2016-07-281-19/+98
* | | | Merge branch 'jk/upload-pack-hook'Junio C Hamano2016-07-061-39/+95
|\ \ \ \
| * | | | config: add a notion of "scope"Jeff King2016-05-271-0/+23
View Lorry Controller Status