summaryrefslogtreecommitdiff
path: root/config.c
Commit message (Expand)AuthorAgeFilesLines
* 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 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano2014-07-221-2/+2
|\ \ \
| * | | config.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-2/+2
* | | | Merge branch 'ow/config-mailmap-pathname' into maintJunio C Hamano2014-06-251-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | config: respect '~' and '~user' in mailmap.fileow/config-mailmap-pathnameØystein Walle2014-05-271-1/+1
| |/ /
| * | 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
| |\ \ \
* | | | | config.c: mark file-local function staticRamsay Jones2013-10-141-1/+1
* | | | | Merge branch 'jk/config-int-range-check'Junio C Hamano2013-09-121-17/+67
|\ \ \ \ \
| * | | | | git-config: always treat --int as 64-bit internallyJeff King2013-09-091-0/+17
| * | | | | config: make numeric parsing errors more clearJeff King2013-09-091-5/+12
| * | | | | config: set errno in numeric git_parse_* functionsJeff King2013-09-091-4/+14
| * | | | | config: properly range-check integer valuesJeff King2013-09-091-6/+6
| * | | | | config: factor out integer parsing from range checksJeff King2013-09-091-6/+22
| |/ / / /
* | | | | Merge branch 'hv/config-from-blob'Junio C Hamano2013-08-301-16/+16
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | config: do not use C function names as struct membershv/config-from-blobJeff King2013-08-261-16/+16
* | | | Merge branch 'hv/config-from-blob'Junio C Hamano2013-07-221-48/+169
|\ \ \ \ | |/ / /
| * | | do not die when error in config parsing of buf occursHeiko Voigt2013-07-121-2/+8
| * | | teach config --blob option to parse config from databaseHeiko Voigt2013-07-121-2/+84
| * | | config: make parsing stack struct independent from actual data sourceHeiko Voigt2013-07-121-21/+43
| * | | config: drop cf validity check in get_next_char()Heiko Voigt2013-07-121-16/+13
| * | | config: factor out config file stack managementHeiko Voigt2013-07-121-14/+28
* | | | Merge branch 'nd/traces'Junio C Hamano2013-06-201-3/+0
|\ \ \ \
| * | | | core: use env variable instead of config var to turn on logging pack accessNguyễn Thái Ngọc Duy2013-06-091-3/+0
| |/ / /
* | | | Merge branch 'jc/core-checkstat'Junio C Hamano2013-06-051-1/+14
|\ \ \ \ | | |_|/ | |/| |
| * | | deprecate core.statinfo at Git 2.0 boundaryJunio C Hamano2013-05-061-1/+14
| |/ /
* | | config: allow inaccessible configuration under $HOMEJonathan Nieder2013-04-151-5/+5
|/ /
* | Merge branch 'jk/config-parsing-cleanup'Junio C Hamano2013-02-041-0/+33
|\ \
| * | config: add helper function for parsing key namesJeff King2013-01-231-0/+33
* | | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-041-0/+8
|\ \ \
| * | | Allow custom "comment char"Junio C Hamano2013-01-161-0/+8
| |/ /
* | | Enable minimal stat checkingRobin Rosenberg2013-01-221-0/+6
|/ /
* | Merge branch 'jn/warn-on-inaccessible-loosen'Junio C Hamano2013-01-061-5/+5
|\ \
View Lorry Controller Status