summaryrefslogtreecommitdiff
path: root/config.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tb/core-eol-fix' into maintJunio C Hamano2016-06-061-4/+0
|\
| * convert: allow core.autocrlf=input and core.eol=crlfTorsten Bögershausen2016-04-251-4/+0
* | Merge branch 'js/windows-dotgit' into maintJunio C Hamano2016-05-261-0/+8
|\ \
| * | mingw: introduce the 'core.hideDotFiles' settingJohannes Schindelin2016-05-111-0/+8
| |/
* | Merge branch 'sb/misc-cleanups' into HEADJunio C Hamano2016-05-181-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' into maintJunio C Hamano2016-05-021-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
| | |_|/ | |/| |
* | | | config: drop git_config_earlyJeff King2016-03-111-8/+4
|/ / /
* | | 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
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jk/diagnose-config-mmap-failure'Junio C Hamano2015-06-111-6/+16
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | config.c: rewrite ENODEV into EISDIR when mmap failsJeff King2015-05-281-0/+2
| * | | | | config.c: avoid xmmap error messagesJeff King2015-05-281-2/+9
| * | | | | config.c: fix mmap leak when writing configJeff King2015-05-281-4/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'pt/xdg-config-path'Junio C Hamano2015-05-111-4/+2
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | git-config: replace use of home_config_paths()Paul Tan2015-05-061-4/+2
* | | | | Merge branch 'jk/reading-packed-refs'Junio C Hamano2015-05-111-1/+3
|\ \ \ \ \
| * | | | | config: use getc_unlocked when reading from fileJeff King2015-04-161-1/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'cn/bom-in-gitignore'Junio C Hamano2015-05-051-3/+3
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | config: use utf8_bom[] from utf.[ch] in git_parse_source()Junio C Hamano2015-04-161-3/+3
| | |/ | |/|
| * | Merge branch 'rs/maint-config-use-labs' into maintJunio C Hamano2014-12-221-2/+2
| |\ \
* | \ \ Merge branch 'jk/config-no-ungetc-eof'Junio C Hamano2015-02-181-3/+8
|\ \ \ \
| * | | | config_buf_ungetc: warn when pushing back a random characterjk/config-no-ungetc-eofJeff King2015-02-051-2/+6