summaryrefslogtreecommitdiff
path: root/config.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| * \ Merge branch 'ow/config-mailmap-pathname' into maintJunio C Hamano2014-06-251-1/+1
| |\ \
* | \ \ Merge branch 'rs/simplify-config-include'Junio C Hamano2014-09-191-5/+1
|\ \ \ \
| * | | | config: simplify git_config_include()rs/simplify-config-includeRené Scharfe2014-09-021-5/+1
* | | | | Merge branch 'ta/config-set-1'Junio C Hamano2014-09-111-24/+128
|\ \ \ \ \
| * | | | | rewrite git_config() to use the config-set APITanay Abhra2014-08-071-8/+43
| * | | | | config: add `git_die_config()` to the config-set APITanay Abhra2014-08-071-2/+37
| * | | | | change `git_config()` return value to voidTanay Abhra2014-08-071-2/+14
| * | | | | add line number and file name info to `config_set`Tanay Abhra2014-08-071-2/+14
| * | | | | config.c: fix accuracy of line number in errorsMatthieu Moy2014-08-071-1/+11
| * | | | | config.c: mark error and warnings strings for translationMatthieu Moy2014-08-071-10/+10
* | | | | | Merge branch 'jk/command-line-config-empty-string'Junio C Hamano2014-09-091-2/+10
|\ \ \ \ \ \
| * | | | | | config: teach "git -c" to recognize an empty stringjk/command-line-config-empty-stringJunio C Hamano2014-08-051-2/+10
* | | | | | | Merge branch 'ta/config-set'Junio C Hamano2014-09-021-0/+274
|\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | |
| * | | | | add `config_set` API for caching config-like filesTanay Abhra2014-07-291-0/+274
* | | | | | Merge branch 'jk/misc-fixes-maint'Junio C Hamano2014-07-281-7/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix memory leak parsing core.commentcharJeff King2014-07-241-5/+5
| | |/ / / | |/| | |
* | | | | Merge branch 'kb/avoid-fchmod-for-now'Junio C Hamano2014-07-211-4/+4
|\ \ \ \ \
| * | | | | config: use chmod() instead of fchmod()kb/avoid-fchmod-for-nowKarsten Blees2014-07-161-4/+4
* | | | | | refactor skip_prefix to return a booleanJeff King2014-06-201-2/+1
* | | | | | Merge branch 'ow/config-mailmap-pathname'Junio C Hamano2014-06-161-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | config: respect '~' and '~user' in mailmap.fileow/config-mailmap-pathnameØystein Walle2014-05-271-1/+1
* | | | | | Merge branch 'bg/xcalloc-nmemb-then-size'Junio C Hamano2014-06-161-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | config.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-2/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/strbuf-tolower'Junio C Hamano2014-06-161-7/+1
|\ \ \ \ \
| * | | | | strbuf: add strbuf_tolower functionjk/strbuf-tolowerJeff King2014-05-231-7/+1
| |/ / / /
* | | | | Merge branch 'nd/status-auto-comment-char'Junio C Hamano2014-06-061-2/+9
|\ \ \ \ \
| * | | | | commit: allow core.commentChar=auto for character auto selectionnd/status-auto-comment-charNguyễn Thái Ngọc Duy2014-05-191-0/+3
| * | | | | config: be strict on core.commentCharNguyễn Thái Ngọc Duy2014-05-191-2/+6
| |/ / / /
* | | | | Merge branch 'ew/config-protect-mode'Junio C Hamano2014-06-031-0/+16
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | config: preserve config file permissions on editsew/config-protect-modeEric Wong2014-05-061-0/+16
| |/ /
| * | Merge branch 'jk/config-path-include-fix' into maintJunio C Hamano2014-03-181-1/+5
| |\ \
* | \ \ Merge branch 'jk/config-die-bad-number-noreturn'Junio C Hamano2014-04-181-0/+1
|\ \ \ \
| * | | | config.c: mark die_bad_number as NORETURNjk/config-die-bad-number-noreturnJeff King2014-04-161-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'ks/config-file-stdin'Junio C Hamano2014-03-141-23/+37
|\ \ \ \
| * | | | config: teach "git config --file -" to read from the standard inputks/config-file-stdinKirill A. Shutemov2014-02-181-14/+27
| * | | | config: change git_config_with_options() interfaceKirill A. Shutemov2014-02-181-7/+6
| * | | | config: disallow relative include paths from blobsJeff King2014-02-181-4/+6
| | |/ / | |/| |
* | | | Merge branch 'jc/core-checkstat-2.0'Junio C Hamano2014-03-071-14/+1
|\ \ \ \
| * | | | core.statinfo: remove as promised in Git 2.0jc/core-checkstat-2.0Junio C Hamano2013-05-061-14/+1
* | | | | Merge branch 'jk/config-path-include-fix'Junio C Hamano2014-02-271-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | handle_path_include: don't look at NULL valuejk/config-path-include-fixJeff King2014-01-281-1/+5
* | | | Merge branch 'cc/starts-n-ends-with'Junio C Hamano2013-12-171-8/+8
|\ \ \ \
| * | | | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-8/+8
| | |_|/ | |/| |
* | | | Merge branch 'tr/config-multivalue-lift-max'Junio C Hamano2013-12-121-6/+13
|\ \ \ \ | |/ / / |/| | |
| * | | config: arbitrary number of matches for --unset and --replace-alltr/config-multivalue-lift-maxThomas Rast2013-12-061-6/+13
| * | | Merge branch 'hv/config-from-blob' into maintJunio C Hamano2013-09-051-16/+16
| |\ \ \