summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2019-01-04Merge branch 'en/merge-path-collision'Libravatar Junio C Hamano1-213/+316
2018-11-08merge-recursive: combine error handlingLibravatar Derrick Stolee1-26/+27
2018-11-08merge-recursive: improve rename/rename(1to2)/add[/add] handlingLibravatar Elijah Newren1-77/+77
2018-11-08merge-recursive: use handle_file_collision for add/add conflictsLibravatar Elijah Newren1-8/+21
2018-11-08merge-recursive: improve handling for rename/rename(2to1) conflictsLibravatar Elijah Newren1-90/+14
2018-11-08merge-recursive: fix rename/add conflict handlingLibravatar Elijah Newren1-51/+86
2018-11-08merge-recursive: new function for better colliding conflict resolutionsLibravatar Elijah Newren1-0/+121
2018-11-08merge-recursive: increase marker length with depth of recursionLibravatar Elijah Newren1-8/+17
2018-11-03Merge branch 'en/merge-cleanup-more'Libravatar Junio C Hamano1-3/+33
2018-10-19Merge branch 'nd/the-index'Libravatar Junio C Hamano1-3/+4
2018-10-18merge-recursive: avoid showing conflicts with merge branch before HEADLibravatar Elijah Newren1-1/+31
2018-10-18merge-recursive: improve auto-merging messages with path collisionsLibravatar Elijah Newren1-2/+2
2018-10-16Merge branch 'en/merge-cleanup'Libravatar Junio C Hamano1-93/+51
2018-09-24Merge branch 'en/double-semicolon-fix'Libravatar Junio C Hamano1-1/+1
2018-09-21revision.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-09-21ll-merge.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+2
2018-09-21diff.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-09-20merge-recursive: rename merge_file_1() and merge_content()Libravatar Elijah Newren1-32/+34
2018-09-20merge-recursive: remove final remaining caller of merge_file_one()Libravatar Elijah Newren1-27/+17
2018-09-20merge-recursive: avoid wrapper function when unnecessary and wastefulLibravatar Elijah Newren1-4/+1
2018-09-20merge-recursive: set paths correctly when three-way merging contentLibravatar Elijah Newren1-40/+9
2018-09-17Merge branch 'jk/cocci'Libravatar Junio C Hamano1-2/+2
2018-09-17Merge branch 'ds/reachable'Libravatar Junio C Hamano1-0/+1
2018-09-05Remove superfluous trailing semicolonsLibravatar Elijah Newren1-1/+1
2018-09-04Merge branch 'en/directory-renames-nothanks'Libravatar Junio C Hamano1-5/+13
2018-08-30merge-recursive: add ability to turn off directory rename detectionLibravatar Elijah Newren1-5/+13
2018-08-29convert "oidcmp() == 0" to oideq()Libravatar Jeff King1-2/+2
2018-08-20Merge branch 'nd/no-the-index'Libravatar Junio C Hamano1-1/+1
2018-08-15Merge branch 'en/merge-recursive-skip-fix'Libravatar Junio C Hamano1-0/+16
2018-08-13convert.c: remove an implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-08-02Merge branch 'en/dirty-merge-fixes'Libravatar Junio C Hamano1-7/+7
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Libravatar Junio C Hamano1-2/+2
2018-08-02Merge branch 'sb/object-store-lookup'Libravatar Junio C Hamano1-7/+10
2018-07-27merge-recursive: preserve skip_worktree bit when necessaryLibravatar Elijah Newren1-0/+16
2018-07-20commit.h: remove method declarationsLibravatar Derrick Stolee1-0/+1
2018-07-18Merge branch 'sb/object-store-grafts'Libravatar Junio C Hamano1-0/+1
2018-07-18Merge branch 'en/merge-recursive-cleanup'Libravatar Junio C Hamano1-82/+104
2018-07-11merge-recursive: enforce rule that index matches head before mergingLibravatar Elijah Newren1-7/+7
2018-07-11merge-recursive: fix assumption that head tree being merged is HEADLibravatar Elijah Newren1-1/+1
2018-07-11merge-recursive: make sure when we say we abort that we actually abortLibravatar Elijah Newren1-2/+2
2018-07-03index_has_changes(): avoid assuming operating on the_indexLibravatar Elijah Newren1-1/+1
2018-07-03block alloc: add lifecycle APIs for cache_entry structsLibravatar Jameson Miller1-1/+1
2018-07-03read-cache: teach make_cache_entry to take object_idLibravatar Jameson Miller1-1/+1
2018-07-03read-cache: teach refresh_cache_entry to take istateLibravatar Jameson Miller1-1/+1
2018-06-29tag: add repository argument to deref_tagLibravatar Stefan Beller1-1/+2
2018-06-29commit: add repository argument to lookup_commit_referenceLibravatar Stefan Beller1-3/+3
2018-06-29tree: add repository argument to lookup_treeLibravatar Stefan Beller1-3/+3
2018-06-29object: add repository argument to parse_objectLibravatar Stefan Beller1-1/+3
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupLibravatar Junio C Hamano1-0/+1
2018-06-25Merge branch 'sb/object-store-alloc'Libravatar Junio C Hamano1-1/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 03:17:46 +0000