summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2019-08-19merge-recursive: provide a better label for diff3 common ancestorLibravatar Elijah Newren1-1/+15
2019-08-16merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()Libravatar Elijah Newren1-10/+9
2019-08-16merge-recursive: be consistent with assertLibravatar Elijah Newren1-1/+1
2019-08-08Merge branch 'en/disable-dir-rename-in-recursive-merge'Libravatar Junio C Hamano1-1/+2
2019-08-06merge-recursive: avoid directory rename detection in recursive caseLibravatar Elijah Newren1-1/+2
2019-06-27Use the right 'struct repository' instead of the_repositoryLibravatar Nguyễn Thái Ngọc Duy1-15/+20
2019-06-27match-trees.c: remove the_repo from shift_tree*()Libravatar Nguyễn Thái Ngọc Duy1-2/+2
2019-06-27tree-walk.c: remove the_repo from get_tree_entry()Libravatar Nguyễn Thái Ngọc Duy1-3/+5
2019-06-06Merge branch 'en/merge-directory-renames-fix'Libravatar Junio C Hamano1-0/+1
2019-06-05merge-recursive: restore accidentally dropped setting of pathLibravatar Elijah Newren1-0/+1
2019-05-09Merge branch 'nd/sha1-name-c-wo-the-repository'Libravatar Junio C Hamano1-1/+6
2019-05-09Merge branch 'en/merge-directory-renames'Libravatar Junio C Hamano1-938/+915
2019-04-16commit.cocci: refactor code, avoid double rewriteLibravatar Nguyễn Thái Ngọc Duy1-1/+6
2019-04-08merge-recursive: switch directory rename detection defaultLibravatar Elijah Newren1-23/+123
2019-04-08merge-recursive: give callers of handle_content_merge() access to contentsLibravatar Elijah Newren1-17/+20
2019-04-08merge-recursive: track information associated with directory renamesLibravatar Elijah Newren1-14/+23
2019-04-08merge-recursive: switch from (oid,mode) pairs to a diff_filespecLibravatar Elijah Newren1-268/+215
2019-04-08merge-recursive: cleanup handle_rename_* function signaturesLibravatar Elijah Newren1-16/+15
2019-04-08merge-recursive: track branch where rename occurred in rename structLibravatar Elijah Newren1-71/+42
2019-04-08merge-recursive: remove ren[12]_other fields from rename_conflict_infoLibravatar Elijah Newren1-50/+21
2019-04-08merge-recursive: shrink rename_conflict_infoLibravatar Elijah Newren1-70/+50
2019-04-08merge-recursive: move some struct declarations togetherLibravatar Elijah Newren1-39/+39
2019-04-08merge-recursive: use 'ci' for rename_conflict_info variable nameLibravatar Elijah Newren1-23/+18
2019-04-08merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'Libravatar Elijah Newren1-8/+10
2019-04-08merge-recursive: rename diff_filespec 'one' to 'o'Libravatar Elijah Newren1-23/+23
2019-04-08merge-recursive: rename merge_options argument from 'o' to 'opt'Libravatar Elijah Newren1-492/+492
2019-04-08Use 'unsigned short' for mode, like diff_filespec doesLibravatar Elijah Newren1-3/+3
2019-04-01submodule: avoid hard-coded constantsLibravatar brian m. carlson1-1/+1
2019-03-07Merge branch 'nd/completion-more-parameters'Libravatar Junio C Hamano1-0/+4
2019-02-20completion: add more parameter value completionLibravatar Nguyễn Thái Ngọc Duy1-0/+4
2019-02-14merge-recursive: drop several unused parametersLibravatar Jeff King1-12/+7
2019-02-06Merge branch 'nd/the-index-final'Libravatar Junio C Hamano1-88/+103
2019-01-14Merge branch 'nd/attr-pathspec-in-tree-walk'Libravatar Junio C Hamano1-1/+2
2019-01-14read-cache.c: remove the_* from index_has_changes()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-01-14merge-recursive.c: remove implicit dependency on the_repositoryLibravatar Nguyễn Thái Ngọc Duy1-21/+24
2019-01-14merge-recursive.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-68/+80
2019-01-14read-cache.c: kill read_index()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-01-14repository.c: replace hold_locked_index() with repo_hold_locked_index()Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-01-04Merge branch 'en/merge-path-collision'Libravatar Junio C Hamano1-213/+316
2018-11-19tree.c: make read_tree*() take 'struct repository *'Libravatar Nguyễn Thái Ngọc Duy1-1/+2
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 13:49:50 +0000