aboutsummaryrefslogtreecommitdiff
path: root/config.c
Commit message (Expand)AuthorAge
* Merge branch 'ps/config-error'Junio C Hamano2016-02-26
|\
| * config: rename git_config_set_or_die to git_config_setPatrick Steinhardt2016-02-22
| * config: rename git_config_set to git_config_set_gentlyPatrick Steinhardt2016-02-22
| * config: introduce set_or_die wrappersPatrick Steinhardt2016-02-16
* | Merge branch 'ls/config-origin'Junio C Hamano2016-02-26
|\ \
| * | config: add 'origin_type' to config_source structLars Schneider2016-02-22
| * | rename git_config_from_buf to git_config_from_memLars Schneider2016-02-19
| |/
* | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-26
|\ \
| * | use xmallocz to avoid size arithmeticJeff King2016-02-22
| |/
* | test-dump-untracked-cache: don't modify the untracked cacheChristian Couder2016-01-27
* | config: add core.untrackedCacheChristian Couder2016-01-27
|/
* Make error message after failing commit_lock_file() less confusingSZEDER Gábor2015-12-01
* Merge branch 'db/push-sign-if-asked'Junio C Hamano2015-08-31
|\
| * config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_...Dave Borowitz2015-08-19
* | Merge branch 'jk/fix-alias-pager-config-key-warnings'Junio C Hamano2015-08-31
|\ \
| * | config: silence warnings for command names with invalid keysJeff King2015-08-24
* | | Merge branch 'ss/fix-config-fd-leak'Junio C Hamano2015-08-26
|\ \ \
| * | | config: close config file handle in case of errorSven Strickroth2015-08-14
* | | | Merge branch 'mh/tempfile'Junio C Hamano2015-08-25
|\ \ \ \ | |/ / / |/| | |
| * | | lockfile: add accessor get_lock_file_path()Michael Haggerty2015-08-10
* | | | Merge branch 'kb/config-unmap-before-renaming'Junio C Hamano2015-07-13
|\ \ \ \
| * | | | config.c: fix writing config files on Windows network sharesKarsten Blees2015-06-30
| | |_|/ | |/| |
| * | | Merge branch 'jk/diagnose-config-mmap-failure' into maintJunio C Hamano2015-06-25
| |\ \ \
| * \ \ \ Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-05
| |\ \ \ \
| * \ \ \ \ Merge branch 'cn/bom-in-gitignore' into maintJunio C Hamano2015-05-13
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jk/diagnose-config-mmap-failure'Junio C Hamano2015-06-11
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | config.c: rewrite ENODEV into EISDIR when mmap failsJeff King2015-05-28
| * | | | | config.c: avoid xmmap error messagesJeff King2015-05-28
| * | | | | config.c: fix mmap leak when writing configJeff King2015-05-28
| | |_|_|/ | |/| | |
* | | | | Merge branch 'pt/xdg-config-path'Junio C Hamano2015-05-11
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | git-config: replace use of home_config_paths()Paul Tan2015-05-06
* | | | | Merge branch 'jk/reading-packed-refs'Junio C Hamano2015-05-11
|\ \ \ \ \
| * | | | | config: use getc_unlocked when reading from fileJeff King2015-04-16
| | |_|/ / | |/| | |
* | | | | Merge branch 'cn/bom-in-gitignore'Junio C Hamano2015-05-05
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | config: use utf8_bom[] from utf.[ch] in git_parse_source()Junio C Hamano2015-04-16
| | |/ | |/|
| * | Merge branch 'rs/maint-config-use-labs' into maintJunio C Hamano2014-12-22
| |\ \
* | \ \ Merge branch 'jk/config-no-ungetc-eof'Junio C Hamano2015-02-18
|\ \ \ \
| * | | | config_buf_ungetc: warn when pushing back a random characterJeff King2015-02-05
| * | | | config: do not ungetc EOFJeff King2015-02-05
* | | | | Merge branch 'jk/blame-commit-label'Junio C Hamano2015-02-11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | use xstrdup_or_null to replace ternary conditionalsJeff King2015-01-13
* | | | | Sync with v2.2.1Junio C Hamano2014-12-18
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Sync with v2.1.4Junio C Hamano2014-12-17
| |\ \ \ \
| | * \ \ \ Sync with v2.0.5Junio C Hamano2014-12-17
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Sync with v1.9.5Junio C Hamano2014-12-17
| | | |\ \ \
| | | | * \ \ Sync with v1.8.5.6Junio C Hamano2014-12-17
| | | | |\ \ \
| | | | | * | | read-cache: optionally disallow NTFS .git variantsJohannes Schindelin2014-12-17
| | | | | * | | read-cache: optionally disallow HFS+ .git variantsJeff King2014-12-17
* | | | | | | | Merge branch 'rs/maint-config-use-labs'Junio C Hamano2014-12-05
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | use labs() for variables of type long instead of abs()René Scharfe2014-11-17
| |/ / / / /