summaryrefslogtreecommitdiff
path: root/resolve-undo.c
AgeCommit message (Expand)AuthorFilesLines
2018-08-13resolve-undo.c: use the right index instead of the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-08-13dir.c: remove an implicit dependency on the_index in pathspec codeLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-07-03block alloc: add lifecycle APIs for cache_entry structsLibravatar Jameson Miller1-1/+3
2018-07-03read-cache: teach make_cache_entry to take object_idLibravatar Jameson Miller1-1/+1
2018-05-02cache: add a function to read an object ID from a bufferLibravatar brian m. carlson1-1/+1
2018-03-14resolve-undo: convert struct resolve_undo_info to object_idLibravatar brian m. carlson1-7/+8
2016-09-07cache: convert struct cache_entry to use struct object_idLibravatar brian m. carlson1-1/+1
2014-06-13resolve-undo: be specific what part of the index has changedLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2014-06-13read-cache: be specific what part of the index has changedLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2014-02-27Merge branch 'nd/submodule-pathspec-ending-with-slash'Libravatar Junio C Hamano1-1/+1
2014-02-24pathspec: convert some match_pathspec_depth() to ce_path_match()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2013-11-18read-cache.c: fix memory leaks caused by removed cache entriesLibravatar Karsten Blees1-2/+5
2013-09-09Merge branch 'jl/submodule-mv'Libravatar Junio C Hamano1-2/+2
2013-07-15convert unmerge_cache to take struct pathspecLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleLibravatar Nguyễn Thái Ngọc Duy1-3/+3
2013-03-27checkout: avoid unnecessary match_pathspec callsLibravatar Nguyễn Thái Ngọc Duy1-1/+18
2010-07-05Convert the users of for_each_string_list to for_each_string_list_item macroLibravatar Alex Riesen1-19/+15
2010-06-27string_list: Fix argument order for string_list_lookupLibravatar Julian Phillips1-1/+1
2010-06-27string_list: Fix argument order for string_list_insertLibravatar Julian Phillips1-2/+2
2010-06-27string_list: Fix argument order for for_each_string_listLibravatar Julian Phillips1-1/+1
2010-02-01build: make code "-Wpointer-arith" cleanLibravatar Junio C Hamano1-2/+2
2009-12-25resolve-undo: "checkout -m path" uses resolve-undo informationLibravatar Junio C Hamano1-0/+59
2009-12-25resolve-undo: record resolved conflicts in a new index extension sectionLibravatar Junio C Hamano1-0/+117