summaryrefslogtreecommitdiffstats
path: root/config.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/attr-tree-config'Junio C Hamano2023-10-291-0/+16
|\
| * attr: add attr.tree for setting the treeish to read attributes fromJohn Cai2023-10-131-0/+16
* | Merge branch 'cw/prelim-cleanup'Junio C Hamano2023-10-101-172/+1
|\ \
| * | parse: separate out parsing functions from config.hCalvin Wan2023-09-301-179/+1
| * | config: correct bad boolean env value error messageCalvin Wan2023-09-301-1/+8
| |/
* / add core.maxTreeDepth configJeff King2023-09-011-0/+5
|/
* Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano2023-07-171-2/+0
|\
| * git-compat-util: move alloc macros to git-compat-util.hCalvin Wan2023-07-051-1/+0
| * treewide: remove unnecessary includes for wrapper.hCalvin Wan2023-07-051-1/+0
* | Merge branch 'gc/config-context'Junio C Hamano2023-07-061-326/+220
|\ \
| * | config: pass source to config_parser_event_fn_tGlen Choo2023-06-281-64/+13
| * | config: add kvi.path, use it to evaluate includesGlen Choo2023-06-281-21/+19
| * | config.c: remove config_reader from configsetsGlen Choo2023-06-281-34/+11
| * | config: pass kvi to die_bad_number()Glen Choo2023-06-281-95/+61
| * | trace2: plumb config kviGlen Choo2023-06-281-46/+0
| * | config.c: pass ctx with CLI configGlen Choo2023-06-281-39/+41
| * | config: pass ctx with config filesGlen Choo2023-06-281-35/+70
| * | config.c: pass ctx in configsetsGlen Choo2023-06-281-19/+16
| * | config: add ctx arg to config_fn_tGlen Choo2023-06-281-14/+24
* | | Merge branch 'gc/config-partial-submodule-kvi-fix'Junio C Hamano2023-07-061-6/+0
|\ \ \ | |_|/ |/| |
| * | config: don't BUG when both kvi and source are setGlen Choo2023-06-261-6/+0
* | | Merge branch 'en/header-split-cache-h-part-3'Junio C Hamano2023-06-301-1/+4
|\ \ \ | |_|/ |/| |
| * | object-store-ll.h: split this header out of object-store.hElijah Newren2023-06-211-1/+1
| * | git-compat-util.h: remove unneccessary include of wildmatch.hElijah Newren2023-06-211-0/+1
| * | repository: remove unnecessary include of path.hElijah Newren2023-06-211-0/+1
| * | read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren2023-06-211-0/+1
* | | Merge branch 'rj/leakfixes'Junio C Hamano2023-06-231-0/+2
|\ \ \
| * | | config: fix a leak in git_config_copy_or_rename_section_in_fileRubén Justo2023-06-171-0/+1
| * | | config: fix a leak in git_config_copy_or_rename_section_in_fileRubén Justo2023-06-131-0/+1
| | |/ | |/|
* | | Merge branch 'ds/disable-replace-refs'Junio C Hamano2023-06-231-5/+0
|\ \ \ | |_|/ |/| |
| * | repository: create read_replace_refs settingDerrick Stolee2023-06-121-5/+0
* | | repository: move 'repository_format_worktree_config' to repo scopeVictoria Dye2023-05-261-3/+4
* | | config: pass 'repo' directly to 'config_with_options()'Victoria Dye2023-05-261-7/+9
* | | config: use gitdir to get worktree configVictoria Dye2023-05-261-9/+19
| |/ |/|
* | Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano2023-05-101-1/+2
|\ \ | |/ |/|
| * treewide: remove cache.h inclusion due to previous changesElijah Newren2023-04-241-1/+1
| * ws.h: move declarations for ws.c functions from cache.hElijah Newren2023-04-241-0/+1
* | Merge branch 'en/header-split-cache-h'Junio C Hamano2023-04-251-0/+6
|\|
| * mailmap, quote: move declarations of global vars to correct unitElijah Newren2023-04-111-0/+1
| * pager.h: move declarations for pager.c functions from cache.hElijah Newren2023-04-111-0/+1
| * object-name.h: move declarations for object-name.c functions from cache.hElijah Newren2023-04-111-0/+1
| * treewide: be explicit about dependence on convert.hElijah Newren2023-04-111-0/+1
| * treewide: be explicit about dependence on advice.hElijah Newren2023-04-111-0/+1
| * treewide: be explicit about dependence on trace.h & trace2.hElijah Newren2023-04-111-0/+1
* | Sync with Git 2.40.1Junio C Hamano2023-04-251-11/+25
|\ \
| * \ Sync with 2.39.3Johannes Schindelin2023-04-171-11/+25
| |\ \
| | * \ Sync with 2.38.5Johannes Schindelin2023-04-171-11/+25
| | |\ \
| | | * \ Sync with 2.37.7Johannes Schindelin2023-04-171-11/+25
| | | |\ \
| | | | * \ Sync with 2.36.6Johannes Schindelin2023-04-171-11/+25
| | | | |\ \
| | | | | * \ Sync with 2.35.8Johannes Schindelin2023-04-171-11/+25
| | | | | |\ \