summaryrefslogtreecommitdiffstats
path: root/rerere.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* treewide: remove unnecessary includes in source filesElijah Newren2023-12-261-2/+0
* Merge branch 'jc/unresolve-removal'Junio C Hamano2023-10-021-1/+1
|\
| * checkout: allow "checkout -m path" to unmerge removed pathsJunio C Hamano2023-08-011-1/+1
* | Merge branch 'jc/retire-get-sha1-hex'Junio C Hamano2023-08-041-1/+1
|\ \
| * | hex: retire get_sha1_hex()Junio C Hamano2023-07-251-1/+1
| |/
* | 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
* | object-store-ll.h: split this header out of object-store.hElijah Newren2023-06-211-1/+1
* | merge-ll: rename from ll-mergeElijah Newren2023-06-211-1/+1
* | repository: remove unnecessary include of path.hElijah Newren2023-06-211-0/+1
* | cache.h: remove this no-longer-used headerElijah Newren2023-06-211-1/+1
* | read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren2023-06-211-0/+1
|/
* copy.h: move declarations for copy.c functions from cache.hElijah Newren2023-04-241-0/+1
* treewide: reduce includes of cache.h in other headersElijah Newren2023-04-111-1/+1
* object-file.h: move declarations for object-file.c functions from cache.hElijah Newren2023-04-111-0/+1
* Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano2023-04-041-2/+3
|\
| * cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-2/+3
* | wrapper.h: move declarations for wrapper.c functions from cache.hElijah Newren2023-03-211-0/+1
* | abspath.h: move absolute path functions from cache.hElijah Newren2023-03-211-0/+1
* | treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
* | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-241-0/+1
* | alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren2023-02-241-1/+2
|/
* Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano2022-05-211-1/+1
|\
| * tree-wide: apply equals-null.cocciJunio C Hamano2022-05-021-1/+1
* | ll-merge: make callers responsible for showing warningsElijah Newren2022-02-021-4/+5
|/
* dir: introduce readdir_skip_dot_and_dotdot() helperElijah Newren2021-05-131-3/+1
* rerere: use strmap to store rerere directoriesJeff King2021-01-281-39/+23
* rerere: tighten rr-cache dirname checkJeff King2021-01-281-2/+3
* rerere: check dirname format while iterating rr_cache directoryJeff King2021-01-281-3/+11
* hash-lookup: rename from sha1-lookupMartin Ågren2021-01-041-1/+1
* sha1-lookup: rename `sha1_pos()` as `hash_pos()`Martin Ågren2021-01-041-1/+1
* Fix spelling errors in code commentsElijah Newren2019-11-101-1/+1
* rerere: replace sha1_to_hexbrian m. carlson2019-08-201-4/+4
* read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy2019-01-141-3/+3
* repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy2019-01-141-1/+1
* rerere.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-13/+13
* Merge branch 'bc/hash-transition-part-15'Junio C Hamano2018-10-301-41/+44
|\
| * rerere: convert to use the_hash_algobrian m. carlson2018-10-151-39/+42
* | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-55/+66
|\ \ | |/ |/|
| * rerere.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-55/+64
| * ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-4/+6
* | Merge branch 'en/rerere-multi-stage-1-fix'Junio C Hamano2018-09-241-1/+1
|\ \
| * | rerere: avoid buffer overrunElijah Newren2018-09-111-1/+1
* | | Merge branch 'tg/rerere'Junio C Hamano2018-09-171-127/+116
|\ \ \ | |_|/ |/| |
| * | rerere: recalculate conflict ID when unresolved conflict is committedThomas Gummerer2018-08-061-4/+3
| * | rerere: teach rerere to handle nested conflictsThomas Gummerer2018-08-061-2/+8
| * | rerere: return strbuf from handle pathThomas Gummerer2018-08-061-40/+18
| * | rerere: factor out handle_conflict functionThomas Gummerer2018-08-061-40/+47
| * | rerere: only return whether a path has conflicts or notThomas Gummerer2018-08-061-11/+12
| * | rerere: fix crash with files rerere can't handleThomas Gummerer2018-08-061-5/+7
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 07:28:24 +0100