summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2019-08-08Merge branch 'en/disable-dir-rename-in-recursive-merge'Junio C Hamano1-1/+2
2019-08-06merge-recursive: avoid directory rename detection in recursive caseElijah Newren1-1/+2
2019-06-27Use the right 'struct repository' instead of the_repositoryNguyễn Thái Ngọc Duy1-15/+20
2019-06-27match-trees.c: remove the_repo from shift_tree*()Nguyễn Thái Ngọc Duy1-2/+2
2019-06-27tree-walk.c: remove the_repo from get_tree_entry()Nguyễn Thái Ngọc Duy1-3/+5
2019-06-06Merge branch 'en/merge-directory-renames-fix'Junio C Hamano1-0/+1
2019-06-05merge-recursive: restore accidentally dropped setting of pathElijah Newren1-0/+1
2019-05-09Merge branch 'nd/sha1-name-c-wo-the-repository'Junio C Hamano1-1/+6
2019-05-09Merge branch 'en/merge-directory-renames'Junio C Hamano1-931/+908
2019-04-16commit.cocci: refactor code, avoid double rewriteNguyễn Thái Ngọc Duy1-1/+6
2019-04-08merge-recursive: switch directory rename detection defaultElijah Newren1-23/+123
2019-04-08merge-recursive: give callers of handle_content_merge() access to contentsElijah Newren1-17/+20
2019-04-08merge-recursive: track information associated with directory renamesElijah Newren1-14/+23
2019-04-08merge-recursive: switch from (oid,mode) pairs to a diff_filespecElijah Newren1-265/+212
2019-04-08merge-recursive: cleanup handle_rename_* function signaturesElijah Newren1-16/+15
2019-04-08merge-recursive: track branch where rename occurred in rename structElijah Newren1-71/+42
2019-04-08merge-recursive: remove ren[12]_other fields from rename_conflict_infoElijah Newren1-50/+21
2019-04-08merge-recursive: shrink rename_conflict_infoElijah Newren1-70/+50
2019-04-08merge-recursive: move some struct declarations togetherElijah Newren1-39/+39
2019-04-08merge-recursive: use 'ci' for rename_conflict_info variable nameElijah Newren1-23/+18
2019-04-08merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'Elijah Newren1-8/+10
2019-04-08merge-recursive: rename diff_filespec 'one' to 'o'Elijah Newren1-23/+23
2019-04-08merge-recursive: rename merge_options argument from 'o' to 'opt'Elijah Newren1-492/+492
2019-04-08Use 'unsigned short' for mode, like diff_filespec doesElijah Newren1-3/+3
2019-04-01submodule: avoid hard-coded constantsbrian m. carlson1-1/+1
2019-03-07Merge branch 'nd/completion-more-parameters'Junio C Hamano1-0/+4
2019-02-20completion: add more parameter value completionNguyễn Thái Ngọc Duy1-0/+4
2019-02-14merge-recursive: drop several unused parametersJeff King1-12/+7
2019-02-06Merge branch 'nd/the-index-final'Junio C Hamano1-88/+103
2019-01-14Merge branch 'nd/attr-pathspec-in-tree-walk'Junio C Hamano1-1/+2
2019-01-14read-cache.c: remove the_* from index_has_changes()Nguyễn Thái Ngọc Duy1-1/+1
2019-01-14merge-recursive.c: remove implicit dependency on the_repositoryNguyễn Thái Ngọc Duy1-21/+24
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-68/+80
2019-01-14read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy1-1/+1
2019-01-14repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy1-1/+1
2019-01-04Merge branch 'en/merge-path-collision'Junio C Hamano1-213/+316
2018-11-19tree.c: make read_tree*() take 'struct repository *'Nguyễn Thái Ngọc Duy1-1/+2
2018-11-08merge-recursive: combine error handlingDerrick Stolee1-26/+27
2018-11-08merge-recursive: improve rename/rename(1to2)/add[/add] handlingElijah Newren1-77/+77
2018-11-08merge-recursive: use handle_file_collision for add/add conflictsElijah Newren1-8/+21
2018-11-08merge-recursive: improve handling for rename/rename(2to1) conflictsElijah Newren1-90/+14
2018-11-08merge-recursive: fix rename/add conflict handlingElijah Newren1-51/+86
2018-11-08merge-recursive: new function for better colliding conflict resolutionsElijah Newren1-0/+121
2018-11-08merge-recursive: increase marker length with depth of recursionElijah Newren1-8/+17
2018-11-03Merge branch 'en/merge-cleanup-more'Junio C Hamano1-3/+33
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-3/+4
2018-10-18merge-recursive: avoid showing conflicts with merge branch before HEADElijah Newren1-1/+31
2018-10-18merge-recursive: improve auto-merging messages with path collisionsElijah Newren1-2/+2
2018-10-16Merge branch 'en/merge-cleanup'Junio C Hamano1-93/+51
2018-09-24Merge branch 'en/double-semicolon-fix'Junio C Hamano1-1/+1
generated by cgit (git 2.54.0.dirty) at 2026-09-15 08:11:48 +0000