summaryrefslogtreecommitdiffstats
path: root/config.c
Commit message (Expand)AuthorAgeFilesLines
* index: make index.threads=true enable ieot and eoieJonathan Nieder2018-11-211-7/+10
* config: report a bug if git_dir exists without commondirJohannes Schindelin2018-11-161-0/+2
* Merge branch 'js/mingw-perl5lib'Junio C Hamano2018-11-131-13/+5
|\
| * config: move Windows-specific config settings into compat/mingw.cJohannes Schindelin2018-10-311-8/+0
| * config: allow for platform-specific core.* config settingsJohannes Schindelin2018-10-311-3/+3
| * config: rename `dummy` parameter to `cb` in git_default_config()Johannes Schindelin2018-10-311-2/+2
* | worktree: add per-worktree config filesNguyễn Thái Ngọc Duy2018-10-221-0/+11
|/
* Merge branch 'bp/read-cache-parallel'Junio C Hamano2018-10-191-0/+18
|\
| * config: add new index.threads config settingBen Peart2018-10-111-0/+18
* | fsmonitor: update GIT_TEST_FSMONITOR supportBen Peart2018-09-281-1/+1
|/
* i18n: fix mistakes in translated stringsJean-Noël Avila2018-08-231-1/+1
* Merge branch 'sb/config-write-fix'Junio C Hamano2018-08-201-1/+11
|\
| * config: fix case sensitive subsection names on writingStefan Beller2018-08-081-1/+11
* | Merge branch 'en/incl-forward-decl'Junio C Hamano2018-08-201-0/+1
|\ \
| * | Move definition of enum branch_track from cache.h to branch.hElijah Newren2018-08-151-0/+1
* | | Merge branch 'mk/http-backend-content-length'Junio C Hamano2018-08-171-1/+1
|\ \ \
| * | | http-backend: respect CONTENT_LENGTH as specified by rfc3875Max Kirillov2018-06-111-1/+1
* | | | Merge branch 'nd/i18n'Junio C Hamano2018-08-151-36/+36
|\ \ \ \
| * | | | config.c: mark more strings for translationNguyễn Thái Ngọc Duy2018-07-231-36/+36
| * | | | Update messages in preparation for i18nNguyễn Thái Ngọc Duy2018-07-231-3/+3
* | | | | Merge branch 'jk/core-use-replace-refs'Junio C Hamano2018-08-151-0/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | add core.usereplacerefs config optionJeff King2018-07-181-0/+5
* | | | | Merge branch 'jt/commit-graph-per-object-store'Junio C Hamano2018-08-021-5/+0
|\ \ \ \ \
| * | | | | commit-graph: add repo arg to graph readersJonathan Tan2018-07-171-5/+0
| * | | | | Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-291-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jk/fsck-gitmodules-gently'Junio C Hamano2018-08-021-9/+23
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | config: add options parameter to git_config_from_memJeff King2018-07-031-4/+7
| * | | | | config: add CONFIG_ERROR_SILENT handlerJeff King2018-07-031-0/+3
| * | | | | config: turn die_on_error into caller-facing enumJeff King2018-07-031-5/+13
| |/ / / /
* | | | | Merge branch 'ao/config-from-gitmodules'Junio C Hamano2018-07-181-17/+0
|\ \ \ \ \
| * | | | | config: move config_from_gitmodules to submodule-config.cAntonio Ospite2018-06-261-17/+0
* | | | | | Merge branch 'sb/object-store-grafts'Junio C Hamano2018-07-181-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | | | | Merge branch 'as/safecrlf-quiet-fix'Junio C Hamano2018-06-281-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | config.c: fix regression for core.safecrlf falseAnthony Sottile2018-06-111-1/+1
* | | | | Merge branch 'nd/complete-config-vars'Junio C Hamano2018-06-251-0/+13
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add and use generic name->id mapping code for color slot parsingNguyễn Thái Ngọc Duy2018-05-291-0/+13
* | | | | Merge branch 'ma/config-store-data-clear'Junio C Hamano2018-05-301-18/+18
|\ \ \ \ \
| * | | | | config: let `config_store_data_clear()` handle `key`Martin Ågren2018-05-211-7/+3
| * | | | | config: let `config_store_data_clear()` handle `value_regex`Martin Ågren2018-05-211-11/+6
| * | | | | config: free resources of `struct config_store_data`Martin Ågren2018-05-211-0/+9
| |/ / / /
* | | | | Merge branch 'js/empty-config-section-fix'Junio C Hamano2018-05-301-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | config: a user-provided invalid section is not a BUGJohannes Schindelin2018-05-181-1/+1
* | | | | Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-301-6/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-6/+6
* | | | | Merge branch 'js/colored-push-errors'Junio C Hamano2018-05-081-1/+1
|\ \ \ \ \
| * | | | | push: colorize errorsRyan Dammrose2018-04-241-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'tb/config-default'Junio C Hamano2018-05-081-0/+10
|\ \ \ \ \
| * | | | | config.c: introduce 'git_config_color' to parse ANSI colorsTaylor Blau2018-04-231-0/+10
* | | | | | Merge branch 'ls/checkout-encoding'Junio C Hamano2018-05-081-0/+5
|\ \ \ \ \ \