aboutsummaryrefslogtreecommitdiffstats
path: root/resolve-undo.c
AgeCommit message (Expand)AuthorFilesLines
2023-10-02Merge branch 'jc/unresolve-removal'Junio C Hamano1-64/+37
2023-07-31checkout: allow "checkout -m path" to unmerge removed pathsJunio C Hamano1-70/+5
2023-07-31resolve-undo: allow resurrecting conflicted state that resolved to deletionJunio C Hamano1-5/+43
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-06-21sparse-index.h: move declarations for sparse-index.c from cache.hElijah Newren1-0/+1
2023-04-24hash-ll.h: split out of hash.h to remove dependency on repository.hElijah Newren1-0/+1
2021-04-30Merge branch 'ds/sparse-index-protections'Junio C Hamano1-0/+4
2021-04-14resolve-undo: ensure full indexDerrick Stolee1-0/+4
2021-03-13use CALLOC_ARRAYRené Scharfe1-2/+2
2018-08-13resolve-undo.c: use the right index instead of the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-08-13dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy1-1/+1
2018-07-03block alloc: add lifecycle APIs for cache_entry structsJameson Miller1-1/+3
2018-07-03read-cache: teach make_cache_entry to take object_idJameson Miller1-1/+1
2018-05-02cache: add a function to read an object ID from a bufferbrian m. carlson1-1/+1
2018-03-14resolve-undo: convert struct resolve_undo_info to object_idbrian m. carlson1-7/+8
2016-09-07cache: convert struct cache_entry to use struct object_idbrian m. carlson1-1/+1
2014-06-13resolve-undo: be specific what part of the index has changedNguyễn Thái Ngọc Duy1-1/+1
2014-06-13read-cache: be specific what part of the index has changedNguyễn Thái Ngọc Duy1-1/+1
2014-02-27Merge branch 'nd/submodule-pathspec-ending-with-slash'Junio C Hamano1-1/+1
2014-02-24pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy1-1/+1
2013-11-18read-cache.c: fix memory leaks caused by removed cache entriesKarsten Blees1-2/+5
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano1-2/+2
2013-07-15convert unmerge_cache to take struct pathspecNguyễn Thái Ngọc Duy1-2/+2
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy1-3/+3
2013-03-27checkout: avoid unnecessary match_pathspec callsNguyễn Thái Ngọc Duy1-1/+18
2010-07-05Convert the users of for_each_string_list to for_each_string_list_item macroAlex Riesen1-19/+15
2010-06-27string_list: Fix argument order for string_list_lookupJulian Phillips1-1/+1
2010-06-27string_list: Fix argument order for string_list_insertJulian Phillips1-2/+2
2010-06-27string_list: Fix argument order for for_each_string_listJulian Phillips1-1/+1
2010-02-01build: make code "-Wpointer-arith" cleanJunio C Hamano1-2/+2
2009-12-25resolve-undo: "checkout -m path" uses resolve-undo informationJunio C Hamano1-0/+59
2009-12-25resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano1-0/+117
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 14:37:11 +0000