summaryrefslogtreecommitdiffstats
path: root/merge.c (unfollow)
Commit message (Expand)AuthorFilesLines
2023-06-21builtin.h: remove unneccessary includesElijah Newren8-2/+7
2023-06-21list-objects-filter-options.h: remove unneccessary includeElijah Newren1-1/+0
2023-06-21diff.h: remove unnecessary include of oidset.hElijah Newren30-1/+35
2023-06-21repository: remove unnecessary include of path.hElijah Newren71-2/+70
2023-06-21log-tree: replace include of revision.h with simple forward declarationElijah Newren3-1/+3
2023-06-21cache.h: remove this no-longer-used headerElijah Newren150-206/+100
2023-06-21read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren77-524/+603
2023-06-21repository.h: move declaration of the_index from cache.hElijah Newren3-4/+4
2023-06-21merge.h: move declarations for merge.c from cache.hElijah Newren6-11/+21
2023-06-21diff.h: move declaration for global in diff.c from cache.hElijah Newren2-3/+2
2023-06-21preload-index.h: move declarations for preload-index.c from elsewhereElijah Newren15-6/+27
2023-06-21sparse-index.h: move declarations for sparse-index.c from cache.hElijah Newren21-2/+21
2023-06-21name-hash.h: move declarations for name-hash.c from cache.hElijah Newren12-9/+26
2023-06-21run-command.h: move declarations for run-command.c from cache.hElijah Newren4-5/+5
2023-06-21statinfo: move stat_{data,validity} functions from cache/read-cacheElijah Newren8-132/+142
2023-06-21read-cache: move shared add/checkout/commit codeElijah Newren2-100/+102
2023-06-21add: modify add_files_to_cache() to avoid globalsElijah Newren4-10/+21
2023-06-21read-cache: move shared commit and ls-files codeElijah Newren2-137/+137
2023-06-21setup: adopt shared init-db & clone codeElijah Newren5-507/+503
2023-06-21init-db, clone: change unnecessary global into passed parameterElijah Newren3-6/+9
2023-06-21init-db: remove unnecessary global variableElijah Newren1-5/+7
2023-06-21init-db: document existing bug with core.bare in template configElijah Newren3-1/+60
2023-06-21The second batch for 2.42Junio C Hamano1-0/+35
2023-06-15doc: trailer: add more examples in DESCRIPTIONLinus Arver1-2/+18
2023-06-15doc: trailer: mention 'key' in DESCRIPTIONLinus Arver1-1/+4
2023-06-15doc: trailer.<token>.command: emphasize deprecationLinus Arver1-2/+2
2023-06-15doc: trailer: use angle brackets for <token> and <value>Linus Arver1-4/+4
2023-06-15doc: trailer: remove redundant phrasingLinus Arver1-3/+2
2023-06-15doc: trailer: examples: avoid the word "message" by itselfLinus Arver1-25/+25
2023-06-15doc: trailer: drop "commit message part" phrasingLinus Arver1-16/+20
2023-06-15doc: trailer: swap verb orderLinus Arver1-1/+1
2023-06-15doc: trailer: fix grammarLinus Arver1-4/+4
2023-06-13Start the 2.42 cycleJunio C Hamano3-2/+41
2023-06-06notes: move the documentation to the structKristoffer Haugsbakk1-9/+11
2023-06-06notes: update documentation for `use_default_notes`Kristoffer Haugsbakk1-2/+3
2023-06-04commit-reach: fix memory leak in get_reachable_subset()Mike Hommey1-0/+2
2023-06-03ci: drop linux-clang jobJeff King1-3/+0
2023-06-03ci: run ASan/UBSan in a single jobJeff King2-9/+3
2023-06-03ci: use clang for ASan/UBSan checksJeff King1-2/+2
2023-06-03diff: detect pathspec magic not supported by --followJeff King2-0/+30
2023-06-03diff: factor out --follow pathspec checkJeff King3-3/+20
2023-06-03pathspec: factor out magic-to-name functionJeff King2-7/+20
2023-06-03surround %s with quotes when failed to lookup commitTeng Long2-4/+4
2023-06-01Git 2.41v2.41.0Junio C Hamano1-1/+1
2023-05-31l10n: zh_TW.po: Git 2.41.0Yi-Jyun Pan1-1191/+1512
2023-05-31l10n: sv.po: Update Swedish translation (5515t0f0u)Peter Krefting1-180/+301
2023-05-26l10n: Update Catalan translationJordi Mas1-5/+5
2023-05-26repository: move 'repository_format_worktree_config' to repo scopeVictoria Dye10-15/+38
2023-05-26config: pass 'repo' directly to 'config_with_options()'Victoria Dye4-16/+21
2023-05-26config: use gitdir to get worktree configVictoria Dye3-11/+48