summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2018-05-08merge-recursive: fix check for skipability of working tree updatesLibravatar Elijah Newren1-16/+32
2018-05-08merge-recursive: make "Auto-merging" comment show for other mergesLibravatar Elijah Newren1-26/+39
2018-05-08merge-recursive: fix remainder of was_dirty() to use original indexLibravatar Elijah Newren1-3/+3
2018-05-08merge-recursive: fix was_tracked() to quit lying with some renamed pathsLibravatar Elijah Newren1-24/+67
2018-05-08merge-recursive: avoid triggering add_cacheinfo error with dirty modLibravatar Elijah Newren1-1/+1
2018-05-08merge-recursive: move more is_dirty handling to merge_contentLibravatar Elijah Newren1-18/+12
2018-05-08merge-recursive: improve add_cacheinfo error handlingLibravatar Elijah Newren1-5/+8
2018-05-08merge-recursive: avoid spurious rename/rename conflict from dir renamesLibravatar Elijah Newren1-2/+2
2018-05-08merge-recursive: fix remaining directory rename + dirty overwrite casesLibravatar Elijah Newren1-3/+22
2018-05-08merge-recursive: fix overwriting dirty files involved in renamesLibravatar Elijah Newren1-19/+66
2018-05-08merge-recursive: avoid clobbering untracked files with directory renamesLibravatar Elijah Newren1-2/+40
2018-05-08merge-recursive: apply necessary modifications for directory renamesLibravatar Elijah Newren1-1/+186
2018-05-08merge-recursive: when comparing files, don't include treesLibravatar Elijah Newren1-6/+21
2018-05-08merge-recursive: check for file level conflicts then get new nameLibravatar Elijah Newren1-8/+166
2018-05-08merge-recursive: add computation of collisions due to dir rename & mergingLibravatar Elijah Newren1-3/+143
2018-05-08merge-recursive: check for directory level conflictsLibravatar Elijah Newren1-0/+119
2018-05-08merge-recursive: add get_directory_renames()Libravatar Elijah Newren1-3/+221
2018-05-06Replace all die("BUG: ...") calls by BUG() onesLibravatar Johannes Schindelin1-6/+6
2018-04-20merge-recursive: make a helper function for cleanup for handle_renamesLibravatar Elijah Newren1-10/+13
2018-04-20merge-recursive: split out code for determining diff_filepairsLibravatar Elijah Newren1-22/+62
2018-04-20merge-recursive: make !o->detect_rename codepath more obviousLibravatar Elijah Newren1-2/+9
2018-04-20merge-recursive: fix leaks of allocated renames and diff_filepairsLibravatar Elijah Newren1-5/+15
2018-04-20merge-recursive: introduce new functions to handle rename logicLibravatar Elijah Newren1-10/+33
2018-04-20merge-recursive: move the get_renames() functionLibravatar Elijah Newren1-69/+70
2018-04-11Revert "Merge branch 'en/rename-directory-detection'"Libravatar Junio C Hamano1-1132/+111
2018-04-11treewide: replace maybe_tree with accessor methodsLibravatar Derrick Stolee1-2/+2
2018-04-11treewide: rename tree to maybe_treeLibravatar Derrick Stolee1-2/+3
2018-04-10Merge branch 'bc/object-id'Libravatar Junio C Hamano1-19/+19
2018-04-10Merge branch 'en/rename-directory-detection'Libravatar Junio C Hamano1-111/+1132
2018-03-21Merge branch 'rj/warning-uninitialized-fix'Libravatar Junio C Hamano1-1/+1
2018-03-20-Wuninitialized: remove some 'init-self' workaroundsLibravatar Ramsay Jones1-1/+1
2018-03-14sha1_file: convert read_sha1_file to struct object_idLibravatar brian m. carlson1-2/+2
2018-03-14tree-walk: convert tree entry functions to object_idLibravatar brian m. carlson1-6/+6
2018-03-14strbuf: convert strbuf_add_unique_abbrev to use struct object_idLibravatar brian m. carlson1-1/+1
2018-03-14tree: convert read_tree_recursive to struct object_idLibravatar brian m. carlson1-1/+1
2018-03-01write_locked_index(): add flag to avoid writing unchanged indexLibravatar Martin Ågren1-3/+2
2018-02-28merge-recursive: always roll back lock in `merge_recursive_generic()`Libravatar Martin Ågren1-1/+4
2018-02-27merge-recursive: ensure we write updates for directory-renamed fileLibravatar Elijah Newren1-3/+1
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 16:43:51 +0000