summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2010-09-29merge-recursive: Make room for directories in D/F conflictsElijah Newren1-0/+58
2010-09-29handle_delete_modify(): Check whether D/F conflicts are still presentElijah Newren1-9/+16
2010-09-29merge_content(): Check whether D/F conflicts are still presentElijah Newren1-2/+20
2010-09-29conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsElijah Newren1-4/+3
2010-09-29conflict_rename_delete(): Check whether D/F conflicts are still presentElijah Newren1-0/+8
2010-09-29merge-recursive: Delay modify/delete conflicts if D/F conflict presentElijah Newren1-0/+9
2010-09-29merge-recursive: Delay content merging for renamesElijah Newren1-36/+15
2010-09-29merge-recursive: Delay handling of rename/delete conflictsElijah Newren1-2/+20
2010-09-29merge-recursive: Move handling of double rename of one file to other fileElijah Newren1-26/+6
2010-09-29merge-recursive: Move handling of double rename of one file to twoElijah Newren1-16/+41
2010-09-29merge-recursive: Avoid doubly merging rename/add conflict contentsElijah Newren1-0/+1
2010-09-29merge-recursive: Update merge_content() call signatureElijah Newren1-2/+4
2010-09-29merge-recursive: Update conflict_rename_rename_1to2() call signatureElijah Newren1-9/+9
2010-09-29merge-recursive: Structure process_df_entry() to handle more casesElijah Newren1-36/+47
2010-09-29merge-recursive: Have process_entry() skip D/F or rename entriesElijah Newren1-0/+3
2010-09-29merge-recursive: New function to assist resolving renames in-core onlyElijah Newren1-3/+30
2010-09-29merge-recursive: New data structures for deferring of D/F conflictsElijah Newren1-0/+44
2010-09-29merge-recursive: Move process_entry's content merging into a functionElijah Newren1-28/+43
2010-09-29merge-recursive: Move delete/modify handling into dedicated functionElijah Newren1-13/+22
2010-09-29merge-recursive: Move rename/delete handling into dedicated functionElijah Newren1-11/+20
2010-09-29merge-recursive: Nuke rename/directory conflict detectionElijah Newren1-18/+0
2010-09-29merge-recursive: Rename conflict_rename_rename*() for clarityElijah Newren1-12/+14
2010-09-29merge-recursive: Small code clarification -- variable name and commentsElijah Newren1-6/+14
2010-09-29merge-recursive: Restructure showing how to chain more process_* functionsJunio C Hamano1-3/+8
2010-09-29Merge branch 'en/rename-d-f' into en/merge-recursiveJunio C Hamano1-8/+8
2010-09-29merge-recursive: option to specify rename thresholdKevin Ballard1-0/+6
2010-09-15Merge branch 'ks/recursive-rename-add-identical'Junio C Hamano1-0/+6
2010-09-09merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirElijah Newren1-8/+8
2010-09-03Merge branch 'dg/local-mod-error-messages'Junio C Hamano1-45/+1
2010-09-03RE: [PATCH] Avoid rename/add conflict when contents are identicalSchalk, Ken1-0/+6
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano1-3/+54
2010-09-03setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy1-1/+1
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy1-45/+1
2010-08-31Merge branch 'en/d-f-conflict-fix'Junio C Hamano1-19/+88
2010-08-27merge-recursive: options to ignore whitespace changesJustin Frankel1-0/+6
2010-08-26merge-recursive --patienceJustin Frankel1-0/+3
2010-08-26ll-merge: replace flag argument with options structJonathan Nieder1-11/+11
2010-08-26merge-recursive: expose merge options for builtin mergeJonathan Nieder1-0/+21
2010-08-21Merge branch 'hv/submodule-find-ff-merge'Junio C Hamano1-3/+6
2010-08-21Merge branch 'dg/local-mod-error-messages'Junio C Hamano1-20/+42
2010-08-20merge-recursive: Avoid excessive output for and reprocessing of renamesElijah Newren1-6/+2
2010-08-18Merge branch 'tf/string-list-init'Junio C Hamano1-1/+2
2010-08-18Merge branch 'cc/find-commit-subject'Junio C Hamano1-10/+4
2010-08-18merge-recursive: Fix multiple file rename across D/F conflictElijah Newren1-0/+1
2010-08-18merge-recursive: Fix typoElijah Newren1-1/+1
2010-08-11unpack_trees: group error messages by typeMatthieu Moy1-6/+19
2010-08-11merge-recursive: distinguish "removed" and "overwritten" messagesMatthieu Moy1-5/+8
2010-08-11merge-recursive: porcelain messages for checkoutDiane Gasselin1-9/+22
2010-08-11Turn unpack_trees_options.msgs into an array + enumMatthieu Moy1-18/+11
2010-08-06merge-recursive --renormalizeJonathan Nieder1-1/+1
generated by cgit (git 2.54.0.dirty) at 2026-09-16 01:12:56 +0000