summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
2019-06-06Merge branch 'en/merge-directory-renames-fix'Junio C Hamano
2019-06-05merge-recursive: restore accidentally dropped setting of pathElijah Newren
2019-05-08Merge branch 'nd/sha1-name-c-wo-the-repository'Junio C Hamano
2019-05-08Merge branch 'en/merge-directory-renames'Junio C Hamano
2019-04-16commit.cocci: refactor code, avoid double rewriteNguyễn Thái Ngọc Duy
2019-04-08merge-recursive: switch directory rename detection defaultElijah Newren
2019-04-08merge-recursive: give callers of handle_content_merge() access to contentsElijah Newren
2019-04-08merge-recursive: track information associated with directory renamesElijah Newren
2019-04-08merge-recursive: switch from (oid,mode) pairs to a diff_filespecElijah Newren
2019-04-08merge-recursive: cleanup handle_rename_* function signaturesElijah Newren
2019-04-08merge-recursive: track branch where rename occurred in rename structElijah Newren
2019-04-08merge-recursive: remove ren[12]_other fields from rename_conflict_infoElijah Newren
2019-04-08merge-recursive: shrink rename_conflict_infoElijah Newren
2019-04-08merge-recursive: move some struct declarations togetherElijah Newren
2019-04-08merge-recursive: use 'ci' for rename_conflict_info variable nameElijah Newren
2019-04-08merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'Elijah Newren
2019-04-08merge-recursive: rename diff_filespec 'one' to 'o'Elijah Newren
2019-04-08merge-recursive: rename merge_options argument from 'o' to 'opt'Elijah Newren
2019-04-08Use 'unsigned short' for mode, like diff_filespec doesElijah Newren
2019-04-01submodule: avoid hard-coded constantsbrian m. carlson
2019-03-07Merge branch 'nd/completion-more-parameters'Junio C Hamano
2019-02-20completion: add more parameter value completionNguyễn Thái Ngọc Duy
2019-02-14merge-recursive: drop several unused parametersJeff King
2019-02-07Merge branch 'nd/the-index-final'Junio C Hamano
2019-01-14Merge branch 'nd/attr-pathspec-in-tree-walk'Junio C Hamano
2019-01-14read-cache.c: remove the_* from index_has_changes()Nguyễn Thái Ngọc Duy
2019-01-14merge-recursive.c: remove implicit dependency on the_repositoryNguyễn Thái Ngọc Duy
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2019-01-14read-cache.c: kill read_index()Nguyễn Thái Ngọc Duy
2019-01-14repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy
2019-01-04Merge branch 'en/merge-path-collision'Junio C Hamano
2018-11-19tree.c: make read_tree*() take 'struct repository *'Nguyễn Thái Ngọc Duy
2018-11-08merge-recursive: combine error handlingDerrick Stolee
2018-11-08merge-recursive: improve rename/rename(1to2)/add[/add] handlingElijah Newren
2018-11-08merge-recursive: use handle_file_collision for add/add conflictsElijah Newren
2018-11-08merge-recursive: improve handling for rename/rename(2to1) conflictsElijah Newren
2018-11-08merge-recursive: fix rename/add conflict handlingElijah Newren
2018-11-08merge-recursive: new function for better colliding conflict resolutionsElijah Newren
2018-11-08merge-recursive: increase marker length with depth of recursionElijah Newren
2018-11-02Merge branch 'en/merge-cleanup-more'Junio C Hamano
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-10-18merge-recursive: avoid showing conflicts with merge branch before HEADElijah Newren
2018-10-18merge-recursive: improve auto-merging messages with path collisionsElijah Newren
2018-10-16Merge branch 'en/merge-cleanup'Junio C Hamano
2018-09-24Merge branch 'en/double-semicolon-fix'Junio C Hamano
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-20merge-recursive: rename merge_file_1() and merge_content()Elijah Newren
2018-09-20merge-recursive: remove final remaining caller of merge_file_one()Elijah Newren