summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2018-02-27merge-recursive: avoid spurious rename/rename conflict from dir renamesLibravatar Elijah Newren1-2/+2
2018-02-27merge-recursive: fix remaining directory rename + dirty overwrite casesLibravatar Elijah Newren1-3/+22
2018-02-27merge-recursive: fix overwriting dirty files involved in renamesLibravatar Elijah Newren1-19/+66
2018-02-27merge-recursive: avoid clobbering untracked files with directory renamesLibravatar Elijah Newren1-2/+40
2018-02-27merge-recursive: apply necessary modifications for directory renamesLibravatar Elijah Newren1-1/+186
2018-02-15Merge branch 'jc/merge-symlink-ours-theirs' into maintLibravatar Junio C Hamano1-4/+13
2018-02-15Merge branch 'po/object-id'Libravatar Junio C Hamano1-2/+3
2018-02-15Merge branch 'en/merge-recursive-fixes'Libravatar Junio C Hamano1-1/+20
2018-02-14merge-recursive: when comparing files, don't include treesLibravatar Elijah Newren1-6/+21
2018-02-14merge-recursive: check for file level conflicts then get new nameLibravatar Elijah Newren1-8/+166
2018-02-14merge-recursive: add computation of collisions due to dir rename & mergingLibravatar Elijah Newren1-3/+143
2018-02-14merge-recursive: check for directory level conflictsLibravatar Elijah Newren1-0/+119
2018-02-14merge-recursive: add get_directory_renames()Libravatar Elijah Newren1-3/+221
2018-02-14merge-recursive: make a helper function for cleanup for handle_renamesLibravatar Elijah Newren1-10/+13
2018-02-14merge-recursive: split out code for determining diff_filepairsLibravatar Elijah Newren1-22/+62
2018-02-14merge-recursive: make !o->detect_rename codepath more obviousLibravatar Elijah Newren1-2/+9
2018-02-14merge-recursive: fix leaks of allocated renames and diff_filepairsLibravatar Elijah Newren1-5/+15
2018-02-14merge-recursive: introduce new functions to handle rename logicLibravatar Elijah Newren1-10/+33
2018-02-14merge-recursive: move the get_renames() functionLibravatar Elijah Newren1-69/+70
2018-01-30sha1_file: convert write_sha1_file to object_idLibravatar Patryk Obara1-2/+3
2018-01-23Merge branch 'jc/merge-symlink-ours-theirs'Libravatar Junio C Hamano1-4/+13
2018-01-19merge-recursive: add explanation for src_entry and dst_entryLibravatar Elijah Newren1-0/+19
2018-01-19merge-recursive: fix logic ordering issueLibravatar Elijah Newren1-1/+1
2018-01-09Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Libravatar Junio C Hamano1-1/+1
2018-01-09merge-recursive: do not look at the index during recursive mergeLibravatar Junio C Hamano1-1/+1
2018-01-03merge: teach -Xours/-Xtheirs to symbolic link mergeLibravatar Junio C Hamano1-4/+13
2017-12-22Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Libravatar Junio C Hamano1-0/+7
2017-12-22merge-recursive: avoid incorporating uncommitted changes in a mergeLibravatar Elijah Newren1-0/+7
2017-12-19Merge branch 'en/merge-recursive-icase-removal'Libravatar Junio C Hamano1-1/+1
2017-12-13Merge branch 'bc/hash-algo'Libravatar Junio C Hamano1-1/+1
2017-11-27Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'Libravatar Junio C Hamano1-2/+3
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Libravatar Junio C Hamano1-0/+2
2017-11-27merge-recursive: ignore_case shouldn't reject intentional removalsLibravatar Elijah Newren1-1/+1
2017-11-15merge-recursive: handle addition of submodule on our side of historyLibravatar Elijah Newren1-2/+3
2017-11-15Merge branch 'ao/merge-verbosity-getenv-just-once'Libravatar Junio C Hamano1-3/+4
2017-11-13Switch empty tree and blob lookups to use hash abstractionLibravatar brian m. carlson1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Libravatar Junio C Hamano1-2/+2
2017-11-08diff: --ignore-cr-at-eolLibravatar Junio C Hamano1-0/+2
2017-11-01diff: make struct diff_flags members lowercaseLibravatar Brandon Williams1-2/+2
2017-11-01diff: remove DIFF_OPT_CLR macroLibravatar Brandon Williams1-1/+1
2017-11-01diff: remove DIFF_OPT_SET macroLibravatar Brandon Williams1-1/+1
2017-11-01merge-recursive: check GIT_MERGE_VERBOSITY only onceLibravatar Andrey Okoshkin1-3/+4
2017-10-06treewide: prefer lockfiles on the stackLibravatar Martin Ågren1-3/+3
2017-09-19Merge branch 'kw/merge-recursive-cleanup'Libravatar Junio C Hamano1-20/+56
2017-09-08merge-recursive: change current file dir string_lists to hashmapLibravatar Kevin Willford1-11/+45
2017-09-06merge-recursive: remove return value from get_files_dirsLibravatar Kevin Willford1-6/+2
2017-09-06merge-recursive: fix memory leakLibravatar Kevin Willford1-3/+9
2017-08-23treewide: correct several "up-to-date" to "up to date"Libravatar Martin Ågren1-1/+1
2017-07-06Merge branch 'sb/merge-recursive-code-cleanup'Libravatar Junio C Hamano1-3/+3
2017-06-30merge-recursive: use DIFF_XDL_SET macroLibravatar Stefan Beller1-3/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 16:49:41 +0000