summaryrefslogtreecommitdiff
path: root/config.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pc/occurred' into maintJunio C Hamano2016-07-061-1/+1
|\
| * config.c: fix misspelt "occurred" in an error messagepc/occurredPeter Colberg2016-06-101-1/+1
| * Merge branch 'tb/core-eol-fix' into maintJunio C Hamano2016-06-061-4/+0
| |\
| * \ Merge branch 'js/windows-dotgit' into maintJunio C Hamano2016-05-261-0/+8
| |\ \
| * \ \ Merge branch 'sb/misc-cleanups' into HEADJunio C Hamano2016-05-181-4/+1
| |\ \ \
| * \ \ \ Merge branch 'jk/do-not-printf-NULL' into maintJunio C Hamano2016-05-021-7/+11
| |\ \ \ \
* | \ \ \ \ Merge branch 'tb/core-eol-fix'Junio C Hamano2016-05-231-4/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | convert: allow core.autocrlf=input and core.eol=crlfTorsten Bögershausen2016-04-251-4/+0
* | | | | | Merge branch 'js/windows-dotgit'Junio C Hamano2016-05-171-0/+8
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | mingw: introduce the 'core.hideDotFiles' settingJohannes Schindelin2016-05-111-0/+8
| |/ / / /
* | | | | Merge branch 'nd/error-errno'Junio C Hamano2016-05-171-13/+9
|\ \ \ \ \
| * | | | | config.c: use error_errno()Nguyễn Thái Ngọc Duy2016-05-091-13/+9
| |/ / / /
* | | | | Merge branch 'ab/hooks'Junio C Hamano2016-05-171-0/+3
|\ \ \ \ \
| * | | | | hooks: allow customizing where the hook directory isÆvar Arnfjörð Bjarmason2016-05-041-0/+3
| |/ / / /
* | | | | Merge branch 'sb/misc-cleanups'Junio C Hamano2016-05-101-4/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | config.c: drop local variableStefan Beller2016-04-281-4/+1
| * | | | Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-03-101-3/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/do-not-printf-NULL'Junio C Hamano2016-04-221-7/+11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | git_config_set_multivar_in_file: handle "unset" errorsjk/do-not-printf-NULLJeff King2016-04-101-2/+6
| * | | | | git_config_set_multivar_in_file: all non-zero returns are errorsJeff King2016-04-101-1/+1
| * | | | | config: lower-case first word of error stringsJeff King2016-04-101-5/+5
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/check-repository-format'Junio C Hamano2016-04-131-8/+4
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | config: drop git_config_earlyJeff King2016-03-111-8/+4
| |/ / /
* | | | Merge branch 'jk/submodule-c-credential'Junio C Hamano2016-04-061-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERSJeff King2016-03-231-1/+1
* | | | Merge branch 'ps/config-error'Junio C Hamano2016-02-261-12/+40
|\ \ \ \ | | |/ / | |/| |
| * | | config: rename git_config_set_or_die to git_config_setps/config-errorPatrick Steinhardt2016-02-221-12/+12
| * | | config: rename git_config_set to git_config_set_gentlyPatrick Steinhardt2016-02-221-14/+15
| * | | config: introduce set_or_die wrappersPatrick Steinhardt2016-02-161-0/+27
* | | | Merge branch 'ls/config-origin'Junio C Hamano2016-02-261-11/+25
|\ \ \ \
| * | | | config: add 'origin_type' to config_source structLars Schneider2016-02-221-11/+25
| * | | | rename git_config_from_buf to git_config_from_memLars Schneider2016-02-191-2/+2
| |/ / /
* | | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-261-3/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | use xmallocz to avoid size arithmeticJeff King2016-02-221-3/+1
| |/
* | test-dump-untracked-cache: don't modify the untracked cacheChristian Couder2016-01-271-0/+4
* | config: add core.untrackedCacheChristian Couder2016-01-271-0/+20
|/
* Make error message after failing commit_lock_file() less confusingSZEDER Gábor2015-12-011-2/+4
* Merge branch 'db/push-sign-if-asked'Junio C Hamano2015-08-311-3/+3
|\
| * config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_...Dave Borowitz2015-08-191-3/+3
* | Merge branch 'jk/fix-alias-pager-config-key-warnings'Junio C Hamano2015-08-311-10/+29
|\ \
| * | config: silence warnings for command names with invalid keysjk/fix-alias-pager-config-key-warningsJeff King2015-08-241-10/+29
* | | Merge branch 'ss/fix-config-fd-leak'Junio C Hamano2015-08-261-1/+4
|\ \ \
| * | | config: close config file handle in case of errorss/fix-config-fd-leakSven Strickroth2015-08-141-1/+4
* | | | Merge branch 'mh/tempfile'Junio C Hamano2015-08-251-7/+7
|\ \ \ \ | |/ / / |/| | |
| * | | lockfile: add accessor get_lock_file_path()Michael Haggerty2015-08-101-7/+7
* | | | Merge branch 'kb/config-unmap-before-renaming'Junio C Hamano2015-07-131-0/+3
|\ \ \ \
| * | | | config.c: fix writing config files on Windows network shareskb/config-unmap-before-renamingKarsten Blees2015-06-301-0/+3
| | |_|/ | |/| |
| * | | Merge branch 'jk/diagnose-config-mmap-failure' into maintJunio C Hamano2015-06-251-6/+16
| |\ \ \
| * \ \ \ Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-051-4/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'cn/bom-in-gitignore' into maintJunio C Hamano2015-05-131-3/+3
| |\ \ \ \ \