aboutsummaryrefslogtreecommitdiffstats
path: root/merge-recursive.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2018-02-28merge-recursive: always roll back lock in `merge_recursive_generic()`Martin Ågren1-1/+4
2018-02-27merge-recursive: ensure we write updates for directory-renamed fileElijah Newren1-3/+1
2018-02-27merge-recursive: avoid spurious rename/rename conflict from dir renamesElijah Newren1-2/+2
2018-02-27merge-recursive: fix remaining directory rename + dirty overwrite casesElijah Newren1-3/+22
2018-02-27merge-recursive: fix overwriting dirty files involved in renamesElijah Newren1-19/+66
2018-02-27merge-recursive: avoid clobbering untracked files with directory renamesElijah Newren1-2/+40
2018-02-27merge-recursive: apply necessary modifications for directory renamesElijah Newren1-1/+186
2018-02-15Merge branch 'jc/merge-symlink-ours-theirs' into maintJunio C Hamano1-4/+13
2018-02-15Merge branch 'po/object-id'Junio C Hamano1-2/+3
2018-02-15Merge branch 'en/merge-recursive-fixes'Junio C Hamano1-1/+20
2018-02-14merge-recursive: when comparing files, don't include treesElijah Newren1-6/+21
2018-02-14merge-recursive: check for file level conflicts then get new nameElijah Newren1-8/+166
2018-02-14merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren1-3/+143
2018-02-14merge-recursive: check for directory level conflictsElijah Newren1-0/+119
2018-02-14merge-recursive: add get_directory_renames()Elijah Newren1-3/+221
2018-02-14merge-recursive: make a helper function for cleanup for handle_renamesElijah Newren1-10/+13
2018-02-14merge-recursive: split out code for determining diff_filepairsElijah Newren1-22/+62
2018-02-14merge-recursive: make !o->detect_rename codepath more obviousElijah Newren1-2/+9
2018-02-14merge-recursive: fix leaks of allocated renames and diff_filepairsElijah Newren1-5/+15
2018-02-14merge-recursive: introduce new functions to handle rename logicElijah Newren1-10/+33
2018-02-14merge-recursive: move the get_renames() functionElijah Newren1-69/+70
2018-01-30sha1_file: convert write_sha1_file to object_idPatryk Obara1-2/+3
2018-01-23Merge branch 'jc/merge-symlink-ours-theirs'Junio C Hamano1-4/+13
2018-01-19merge-recursive: add explanation for src_entry and dst_entryElijah Newren1-0/+19
2018-01-19merge-recursive: fix logic ordering issueElijah Newren1-1/+1
2018-01-09Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano1-1/+1
2018-01-09merge-recursive: do not look at the index during recursive mergeJunio C Hamano1-1/+1
2018-01-03merge: teach -Xours/-Xtheirs to symbolic link mergeJunio C Hamano1-4/+13
2017-12-22Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano1-0/+7
2017-12-22merge-recursive: avoid incorporating uncommitted changes in a mergeElijah Newren1-0/+7
2017-12-19Merge branch 'en/merge-recursive-icase-removal'Junio C Hamano1-1/+1
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano1-1/+1
2017-11-27Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'Junio C Hamano1-2/+3
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano1-0/+2
2017-11-27merge-recursive: ignore_case shouldn't reject intentional removalsElijah Newren1-1/+1
2017-11-15merge-recursive: handle addition of submodule on our side of historyElijah Newren1-2/+3
2017-11-15Merge branch 'ao/merge-verbosity-getenv-just-once'Junio C Hamano1-3/+4
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano1-2/+2
2017-11-08diff: --ignore-cr-at-eolJunio C Hamano1-0/+2
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams1-2/+2
2017-11-01diff: remove DIFF_OPT_CLR macroBrandon Williams1-1/+1
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams1-1/+1
2017-11-01merge-recursive: check GIT_MERGE_VERBOSITY only onceAndrey Okoshkin1-3/+4
2017-10-06treewide: prefer lockfiles on the stackMartin Ågren1-3/+3
2017-09-19Merge branch 'kw/merge-recursive-cleanup'Junio C Hamano1-20/+56
2017-09-08merge-recursive: change current file dir string_lists to hashmapKevin Willford1-11/+45
2017-09-06merge-recursive: remove return value from get_files_dirsKevin Willford1-6/+2
2017-09-06merge-recursive: fix memory leakKevin Willford1-3/+9
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren1-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-06 11:07:17 +0000