aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAge
* merge-recursive: Remove redundant path clearing for D/F conflictsElijah Newren2010-09-29
* merge-recursive: Make room for directories in D/F conflictsElijah Newren2010-09-29
* handle_delete_modify(): Check whether D/F conflicts are still presentElijah Newren2010-09-29
* merge_content(): Check whether D/F conflicts are still presentElijah Newren2010-09-29
* conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsElijah Newren2010-09-29
* conflict_rename_delete(): Check whether D/F conflicts are still presentElijah Newren2010-09-29
* merge-recursive: Delay modify/delete conflicts if D/F conflict presentElijah Newren2010-09-29
* merge-recursive: Delay content merging for renamesElijah Newren2010-09-29
* merge-recursive: Delay handling of rename/delete conflictsElijah Newren2010-09-29
* merge-recursive: Move handling of double rename of one file to other fileElijah Newren2010-09-29
* merge-recursive: Move handling of double rename of one file to twoElijah Newren2010-09-29
* merge-recursive: Avoid doubly merging rename/add conflict contentsElijah Newren2010-09-29
* merge-recursive: Update merge_content() call signatureElijah Newren2010-09-29
* merge-recursive: Update conflict_rename_rename_1to2() call signatureElijah Newren2010-09-29
* merge-recursive: Structure process_df_entry() to handle more casesElijah Newren2010-09-29
* merge-recursive: Have process_entry() skip D/F or rename entriesElijah Newren2010-09-29
* merge-recursive: New function to assist resolving renames in-core onlyElijah Newren2010-09-29
* merge-recursive: New data structures for deferring of D/F conflictsElijah Newren2010-09-29
* merge-recursive: Move process_entry's content merging into a functionElijah Newren2010-09-29
* merge-recursive: Move delete/modify handling into dedicated functionElijah Newren2010-09-29
* merge-recursive: Move rename/delete handling into dedicated functionElijah Newren2010-09-29
* merge-recursive: Nuke rename/directory conflict detectionElijah Newren2010-09-29
* merge-recursive: Rename conflict_rename_rename*() for clarityElijah Newren2010-09-29
* merge-recursive: Small code clarification -- variable name and commentsElijah Newren2010-09-29
* merge-recursive: Restructure showing how to chain more process_* functionsJunio C Hamano2010-09-29
* Merge branch 'en/rename-d-f' into en/merge-recursiveJunio C Hamano2010-09-29
|\
| * merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirElijah Newren2010-09-09
* | Merge branch 'ks/recursive-rename-add-identical'Junio C Hamano2010-09-15
|\ \ | |/ |/|
| * RE: [PATCH] Avoid rename/add conflict when contents are identicalSchalk, Ken2010-09-03
* | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-03
|\ \
| * | setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-03
| * | Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-03
* | | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-03
|\ \ \
| * | | merge-recursive --renormalizeJonathan Nieder2010-08-06
| * | | ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-06
| * | | ll-merge: make flag easier to populateJonathan Nieder2010-08-06
| * | | merge-trees: let caller decide whether to renormalizeJonathan Nieder2010-08-06
| * | | merge-trees: push choice to renormalize away from low levelJonathan Nieder2010-08-06
| * | | Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen2010-07-02
* | | | Merge branch 'en/d-f-conflict-fix'Junio C Hamano2010-08-31
|\ \ \ \
| * | | | merge-recursive: Avoid excessive output for and reprocessing of renamesElijah Newren2010-08-20
| * | | | merge-recursive: Fix multiple file rename across D/F conflictElijah Newren2010-08-18
| * | | | merge-recursive: Fix typoElijah Newren2010-08-18
| * | | | merge_recursive: Fix renames across paths below D/F conflictsElijah Newren2010-07-09
| * | | | merge-recursive: Fix D/F conflictsElijah Newren2010-07-09
* | | | | Merge branch 'hv/submodule-find-ff-merge'Junio C Hamano2010-08-21
|\ \ \ \ \
| * | | | | Implement automatic fast-forward merge for submodulesHeiko Voigt2010-07-07
* | | | | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-08-21
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | unpack_trees: group error messages by typeMatthieu Moy2010-08-11
| * | | | | merge-recursive: distinguish "removed" and "overwritten" messagesMatthieu Moy2010-08-11
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-26 08:09:34 +0000