summaryrefslogtreecommitdiff
path: root/config.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/maint-config-use-labs' into maintJunio C Hamano2014-12-221-2/+2
|\
| * use labs() for variables of type long instead of abs()rs/maint-config-use-labsRené Scharfe2014-11-171-2/+2
* | 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 '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
| |\ \ \ \ \
| * \ \ \ \ \ 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
| |/ /
View Lorry Controller Status