summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2010-11-29Merge branch 'en/merge-recursive'Libravatar Junio C Hamano1-223/+429
2010-10-26Merge branch 'kb/merge-recursive-rename-threshold'Libravatar Junio C Hamano1-0/+6
2010-10-26Merge branch 'jf/merge-ignore-ws'Libravatar Junio C Hamano1-11/+41
2010-10-21merge-recursive:make_room_for_directories - work around dumb compilersLibravatar Junio C Hamano1-1/+1
2010-09-29merge-recursive: Remove redundant path clearing for D/F conflictsLibravatar Elijah Newren1-15/+2
2010-09-29merge-recursive: Make room for directories in D/F conflictsLibravatar Elijah Newren1-0/+58
2010-09-29handle_delete_modify(): Check whether D/F conflicts are still presentLibravatar Elijah Newren1-9/+16
2010-09-29merge_content(): Check whether D/F conflicts are still presentLibravatar Elijah Newren1-2/+20
2010-09-29conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsLibravatar Elijah Newren1-4/+3
2010-09-29conflict_rename_delete(): Check whether D/F conflicts are still presentLibravatar Elijah Newren1-0/+8
2010-09-29merge-recursive: Delay modify/delete conflicts if D/F conflict presentLibravatar Elijah Newren1-0/+9
2010-09-29merge-recursive: Delay content merging for renamesLibravatar Elijah Newren1-36/+15
2010-09-29merge-recursive: Delay handling of rename/delete conflictsLibravatar Elijah Newren1-2/+20
2010-09-29merge-recursive: Move handling of double rename of one file to other fileLibravatar Elijah Newren1-26/+6
2010-09-29merge-recursive: Move handling of double rename of one file to twoLibravatar Elijah Newren1-16/+41
2010-09-29merge-recursive: Avoid doubly merging rename/add conflict contentsLibravatar Elijah Newren1-0/+1
2010-09-29merge-recursive: Update merge_content() call signatureLibravatar Elijah Newren1-2/+4
2010-09-29merge-recursive: Update conflict_rename_rename_1to2() call signatureLibravatar Elijah Newren1-9/+9
2010-09-29merge-recursive: Structure process_df_entry() to handle more casesLibravatar Elijah Newren1-36/+47
2010-09-29merge-recursive: Have process_entry() skip D/F or rename entriesLibravatar Elijah Newren1-0/+3
2010-09-29merge-recursive: New function to assist resolving renames in-core onlyLibravatar Elijah Newren1-3/+30
2010-09-29merge-recursive: New data structures for deferring of D/F conflictsLibravatar Elijah Newren1-0/+44
2010-09-29merge-recursive: Move process_entry's content merging into a functionLibravatar Elijah Newren1-28/+43
2010-09-29merge-recursive: Move delete/modify handling into dedicated functionLibravatar Elijah Newren1-13/+22
2010-09-29merge-recursive: Move rename/delete handling into dedicated functionLibravatar Elijah Newren1-11/+20
2010-09-29merge-recursive: Nuke rename/directory conflict detectionLibravatar Elijah Newren1-18/+0
2010-09-29merge-recursive: Rename conflict_rename_rename*() for clarityLibravatar Elijah Newren1-12/+14
2010-09-29merge-recursive: Small code clarification -- variable name and commentsLibravatar Elijah Newren1-6/+14
2010-09-29merge-recursive: Restructure showing how to chain more process_* functionsLibravatar Junio C Hamano1-3/+8
2010-09-29Merge branch 'en/rename-d-f' into en/merge-recursiveLibravatar Junio C Hamano1-8/+8
2010-09-29merge-recursive: option to specify rename thresholdLibravatar Kevin Ballard1-0/+6
2010-09-15Merge branch 'ks/recursive-rename-add-identical'Libravatar Junio C Hamano1-0/+6
2010-09-09merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirLibravatar Elijah Newren1-8/+8
2010-09-03Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano1-45/+1
2010-09-03RE: [PATCH] Avoid rename/add conflict when contents are identicalLibravatar Schalk, Ken1-0/+6
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano1-3/+54
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterLibravatar Matthieu Moy1-1/+1
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itLibravatar Matthieu Moy1-45/+1
2010-08-31Merge branch 'en/d-f-conflict-fix'Libravatar Junio C Hamano1-19/+88
2010-08-27merge-recursive: options to ignore whitespace changesLibravatar Justin Frankel1-0/+6
2010-08-26merge-recursive --patienceLibravatar Justin Frankel1-0/+3
2010-08-26ll-merge: replace flag argument with options structLibravatar Jonathan Nieder1-11/+11
2010-08-26merge-recursive: expose merge options for builtin mergeLibravatar Jonathan Nieder1-0/+21
2010-08-21Merge branch 'hv/submodule-find-ff-merge'Libravatar Junio C Hamano1-3/+6
2010-08-21Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano1-20/+42
2010-08-20merge-recursive: Avoid excessive output for and reprocessing of renamesLibravatar Elijah Newren1-6/+2
2010-08-18Merge branch 'tf/string-list-init'Libravatar Junio C Hamano1-1/+2
2010-08-18Merge branch 'cc/find-commit-subject'Libravatar Junio C Hamano1-10/+4
2010-08-18merge-recursive: Fix multiple file rename across D/F conflictLibravatar Elijah Newren1-0/+1
2010-08-18merge-recursive: Fix typoLibravatar Elijah Newren1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 08:43:35 +0000