aboutsummaryrefslogtreecommitdiff
path: root/config.c
Commit message (Expand)AuthorAge
* Merge branch 'nd/conditional-config-include'Junio C Hamano2017-03-21
|\
| * config: add conditional includeNguyễn Thái Ngọc Duy2017-03-11
* | Merge branch 'js/early-config'Junio C Hamano2017-03-17
|\ \
| * | read_early_config(): really discover .git/Johannes Schindelin2017-03-14
| * | read_early_config(): avoid .git/config hack when unneededJohannes Schindelin2017-03-14
| * | setup: make read_early_config() reusableJohannes Schindelin2017-03-14
| |/
* | Merge branch 'cc/split-index-config'Junio C Hamano2017-03-17
|\ \
| * | config: add git_config_get_expiry() from gc.cChristian Couder2017-03-01
| * | config: add git_config_get_max_percent_split_change()Christian Couder2017-03-01
| * | config: add git_config_get_split_index()Christian Couder2017-03-01
| * | config: mark an error message up for translationChristian Couder2017-03-01
* | | Merge branch 'jk/parse-config-key-cleanup'Junio C Hamano2017-03-10
|\ \ \
| * | | parse_config_key: allow matching single-level configJeff King2017-02-24
| * | | parse_config_key: use skip_prefix instead of starts_withJeff King2017-02-24
| * | | Merge branch 'nd/config-misc-fixes' into maintJunio C Hamano2017-01-31
| |\ \ \
| * \ \ \ Merge branch 'jc/abbrev-autoscale-config' into maintJunio C Hamano2017-01-31
| |\ \ \ \
* | \ \ \ \ Merge branch 'jc/config-case-cmdline-take-2'Junio C Hamano2017-03-10
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | config: use git_config_parse_key() in git_config_parse_parameter()Junio C Hamano2017-02-23
| * | | | | config: move a few helper functions upJunio C Hamano2017-02-23
* | | | | | refs: add option core.logAllRefUpdates = alwaysCornelius Weig2017-01-31
* | | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-01-18
|\ \ \ \ \ \
| * | | | | | submodules: load gitmodules file from commit sha1Brandon Williams2016-12-22
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'nd/config-misc-fixes'Junio C Hamano2017-01-10
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | config.c: handle lock file in error case in git_config_rename_...Nguyễn Thái Ngọc Duy2016-12-22
| * | | | | config.c: rename label unlock_and_outNguyễn Thái Ngọc Duy2016-12-20
| * | | | | config.c: handle error case for fstat() callsNguyễn Thái Ngọc Duy2016-12-20
| * | | | | Merge branch 'pc/occurred' into maintJunio C Hamano2016-07-06
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jc/abbrev-autoscale-config'Junio C Hamano2017-01-10
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | config.abbrev: document the new default that auto-scalesJunio C Hamano2016-12-22
| | |_|/ / | |/| | |
* | | | | compression: unify pack.compression configuration parsingJunio C Hamano2016-11-15
|/ / / /
* | | | get_short_sha1: make default disambiguation configurableJeff King2016-09-27
* | | | Merge branch 'jk/setup-sequence-update'Junio C Hamano2016-09-21
|\ \ \ \ | |_|_|/ |/| | |
| * | | config: only read .git/config from configured reposJeff King2016-09-13
| * | | pager: stop loading git_default_config()Jeff King2016-09-13
* | | | i18n: simplify numeric error reportingJean-Noel Avila2016-08-24
* | | | i18n: config: unfold error messages marked for translationVasco Almeida2016-07-28
* | | | Merge branch 'jk/upload-pack-hook'Junio C Hamano2016-07-06
|\ \ \ \
| * | | | config: add a notion of "scope"Jeff King2016-05-27
| * | | | config: return configset value for current_config_ functionsJeff King2016-05-27
| * | | | config: set up config_source for command-line configJeff King2016-05-24
| * | | | git_config_parse_parameter: refactor cleanup codeJeff King2016-05-24
| * | | | git_config_with_options: drop "found" countingJeff King2016-05-24
| | |/ / | |/| |
* | | | Merge branch 'pc/occurred'Junio C Hamano2016-06-27
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | config.c: fix misspelt "occurred" in an error messagePeter Colberg2016-06-10
| |/
| * Merge branch 'tb/core-eol-fix' into maintJunio C Hamano2016-06-06
| |\
| * \ Merge branch 'js/windows-dotgit' into maintJunio C Hamano2016-05-26
| |\ \
| * \ \ Merge branch 'sb/misc-cleanups' into HEADJunio C Hamano2016-05-18
| |\ \ \
| * \ \ \ Merge branch 'jk/do-not-printf-NULL' into maintJunio C Hamano2016-05-02
| |\ \ \ \
* | \ \ \ \ Merge branch 'tb/core-eol-fix'Junio C Hamano2016-05-23
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | convert: allow core.autocrlf=input and core.eol=crlfTorsten Bögershausen2016-04-25