summaryrefslogtreecommitdiff
path: root/rerere.c
AgeCommit message (Expand)AuthorFilesLines
2026-08-15Merge branch 'jc/add-resolved'Junio C Hamano1-32/+6
2026-07-31merge-ll: consolidate conflict marker scanning logicJunio C Hamano1-32/+6
2026-07-30Merge branch 'rs/tempfile-wo-the-repository'Junio C Hamano1-3/+3
2026-07-27Merge branch 'ps/copy-wo-the-repository'Junio C Hamano1-1/+1
2026-07-16copy: drop dependency on `the_repository`Patrick Steinhardt1-1/+1
2026-07-14use repo_hold_lock_file_for_update{,_mode,_timeout}() with custom reposRené Scharfe1-3/+3
2026-07-07hash: use git_hash_init() consistentlyJeff King1-1/+1
2026-06-21Merge branch 'js/objects-larger-than-4gb-on-windows-more'Junio C Hamano1-1/+1
2026-06-15odb: use size_t for object_info.sizep and the size APIsJohannes Schindelin1-1/+1
2026-05-30docs: fix typos and grammarWeijie Yuan1-1/+1
2026-03-27Merge branch 'jc/rerere-modern-strbuf-handling'Junio C Hamano1-6/+2
2026-03-19rerere: update to modern representation of empty strbufsJunio C Hamano1-6/+2
2025-07-23config: move Git config parsing into "environment.c"Patrick Steinhardt1-0/+1
2025-07-23config: drop `git_config_get_bool()` wrapperPatrick Steinhardt1-2/+2
2025-07-23config: drop `git_config()` wrapperPatrick Steinhardt1-2/+2
2025-07-01odb: rename `repo_read_object_file()`Patrick Steinhardt1-3/+2
2025-07-01object-store: rename files to "odb.{c,h}"Patrick Steinhardt1-1/+1
2025-04-15object-store: merge "object-store-ll.h" and "object-store.h"Patrick Steinhardt1-1/+1
2025-04-15object-file: move `mkdir_in_gitdir()` into "path.c"Patrick Steinhardt1-2/+3
2025-03-05Merge branch 'ps/path-sans-the-repository'Junio C Hamano1-30/+71
2025-02-28path: drop `git_path()` in favor of `repo_git_path()`Patrick Steinhardt1-3/+11
2025-02-28rerere: let `rerere_path()` write paths into a caller-provided bufferPatrick Steinhardt1-27/+60
2025-01-31global: adapt callers to use generic hash context helpersPatrick Steinhardt1-7/+7
2025-01-31hash: stop typedeffing the hash contextPatrick Steinhardt1-2/+2
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt1-0/+1
2024-08-23Merge branch 'ps/config-wo-the-repository'Junio C Hamano1-2/+4
2024-08-13config: pass repo to `git_config_get_expiry_in_days()`Patrick Steinhardt1-2/+4
2024-08-01builtin/rerere: fix various trivial memory leaksPatrick Steinhardt1-2/+7
2024-07-08Merge branch 'ps/leakfixes-more'Junio C Hamano1-0/+3
2024-06-14global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt1-0/+2
2024-06-11rerere: fix various trivial leaksPatrick Steinhardt1-0/+3
2024-04-23Merge branch 'mr/rerere-crash-fix'Junio C Hamano1-0/+5
2024-04-16rerere: fix crashes due to unmatched opening conflict markersMarcel Röthke1-0/+5
2024-02-14Merge branch 'js/check-null-from-read-object-file'Junio C Hamano1-0/+3
2024-02-06Always check the return value of `repo_read_object_file()`Johannes Schindelin1-0/+3
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-2/+0
2023-10-02Merge branch 'jc/unresolve-removal'Junio C Hamano1-1/+1
2023-08-04Merge branch 'jc/retire-get-sha1-hex'Junio C Hamano1-1/+1
2023-07-31checkout: allow "checkout -m path" to unmerge removed pathsJunio C Hamano1-1/+1
2023-07-24hex: retire get_sha1_hex()Junio C Hamano1-1/+1
2023-07-05git-compat-util: move alloc macros to git-compat-util.hCalvin Wan1-1/+0
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan1-1/+0
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren1-1/+1
2023-06-21merge-ll: rename from ll-mergeElijah Newren1-1/+1
2023-06-21repository: remove unnecessary include of path.hElijah Newren1-0/+1
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-1/+1
2023-06-21read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren1-0/+1
2023-04-24copy.h: move declarations for copy.c functions from cache.hElijah Newren1-0/+1
2023-04-11treewide: reduce includes of cache.h in other headersElijah Newren1-1/+1
2023-04-11object-file.h: move declarations for object-file.c functions from cache.hElijah Newren1-0/+1