summaryrefslogtreecommitdiff
path: root/config.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | config: do not ungetc EOFJeff King2015-02-051-1/+2
* | | | | Merge branch 'jk/blame-commit-label'Junio C Hamano2015-02-111-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | use xstrdup_or_null to replace ternary conditionalsJeff King2015-01-131-1/+1
* | | | | Sync with v2.2.1Junio C Hamano2014-12-181-0/+10
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Sync with v2.1.4Junio C Hamano2014-12-171-0/+10
| |\ \ \ \
| | * \ \ \ Sync with v2.0.5Junio C Hamano2014-12-171-0/+10
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Sync with v1.9.5Junio C Hamano2014-12-171-0/+10
| | | |\ \ \
| | | | * \ \ Sync with v1.8.5.6Junio C Hamano2014-12-171-0/+10
| | | | |\ \ \
| | | | | * | | read-cache: optionally disallow NTFS .git variantsJohannes Schindelin2014-12-171-0/+5
| | | | | * | | read-cache: optionally disallow HFS+ .git variantsJeff King2014-12-171-0/+5
* | | | | | | | Merge branch 'rs/maint-config-use-labs'Junio C Hamano2014-12-051-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | use labs() for variables of type long instead of abs()rs/maint-config-use-labsRené Scharfe2014-11-171-2/+2
| |/ / / / /
| * | | | | Merge branch 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano2014-09-291-6/+17
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/command-line-config-empty-string' into maintJunio C Hamano2014-09-191-2/+10
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'mh/lockfile'Junio C Hamano2014-10-141-7/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-011-0/+1
| * | | | | | | lockfile: change lock_file::filename into a strbufMichael Haggerty2014-10-011-7/+7
| * | | | | | | git_config_set_multivar_in_file(): avoid call to rollback_lock_file()Michael Haggerty2014-10-011-0/+1
* | | | | | | | Merge branch 'sp/stream-clean-filter'Junio C Hamano2014-10-081-0/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | config.c: add git_env_ulong() to parse environment variableSteffen Prohaska2014-08-281-0/+16
| |/ / / / / /
* | | | | | | Merge branch 'ta/config-add-to-empty-or-true-fix'Junio C Hamano2014-09-191-6/+17
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | config: avoid a funny sentinel value "a^"ta/config-add-to-empty-or-true-fixJeff King2014-09-111-6/+17
| * | | | | | make config --add behave correctly for empty and NULL valuesTanay Abhra2014-08-181-1/+1
| | |_|/ / / | |/| | | |
| * | | | | Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano2014-07-221-2/+2
| |\ \ \ \ \