summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* standardize brace placement in struct definitionsJonathan Nieder2011-03-161-8/+4
* Merge branch 'en/merge-recursive'Junio C Hamano2010-11-291-223/+429
|\
| * merge-recursive:make_room_for_directories - work around dumb compilersJunio C Hamano2010-10-211-1/+1
| * merge-recursive: Remove redundant path clearing for D/F conflictsElijah Newren2010-09-291-15/+2
| * merge-recursive: Make room for directories in D/F conflictsElijah Newren2010-09-291-0/+58
| * handle_delete_modify(): Check whether D/F conflicts are still presentElijah Newren2010-09-291-9/+16
| * merge_content(): Check whether D/F conflicts are still presentElijah Newren2010-09-291-2/+20
| * conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsElijah Newren2010-09-291-4/+3
| * conflict_rename_delete(): Check whether D/F conflicts are still presentElijah Newren2010-09-291-0/+8
| * merge-recursive: Delay modify/delete conflicts if D/F conflict presentElijah Newren2010-09-291-0/+9
| * merge-recursive: Delay content merging for renamesElijah Newren2010-09-291-36/+15
| * merge-recursive: Delay handling of rename/delete conflictsElijah Newren2010-09-291-2/+20
| * merge-recursive: Move handling of double rename of one file to other fileElijah Newren2010-09-291-26/+6
| * merge-recursive: Move handling of double rename of one file to twoElijah Newren2010-09-291-16/+41
| * merge-recursive: Avoid doubly merging rename/add conflict contentsElijah Newren2010-09-291-0/+1
| * merge-recursive: Update merge_content() call signatureElijah Newren2010-09-291-2/+4
| * merge-recursive: Update conflict_rename_rename_1to2() call signatureElijah Newren2010-09-291-9/+9
| * merge-recursive: Structure process_df_entry() to handle more casesElijah Newren2010-09-291-36/+47
| * merge-recursive: Have process_entry() skip D/F or rename entriesElijah Newren2010-09-291-0/+3
| * merge-recursive: New function to assist resolving renames in-core onlyElijah Newren2010-09-291-3/+30
| * merge-recursive: New data structures for deferring of D/F conflictsElijah Newren2010-09-291-0/+44
| * merge-recursive: Move process_entry's content merging into a functionElijah Newren2010-09-291-28/+43
| * merge-recursive: Move delete/modify handling into dedicated functionElijah Newren2010-09-291-13/+22
| * merge-recursive: Move rename/delete handling into dedicated functionElijah Newren2010-09-291-11/+20
| * merge-recursive: Nuke rename/directory conflict detectionElijah Newren2010-09-291-18/+0
| * merge-recursive: Rename conflict_rename_rename*() for clarityElijah Newren2010-09-291-12/+14
| * merge-recursive: Small code clarification -- variable name and commentsElijah Newren2010-09-291-6/+14
| * merge-recursive: Restructure showing how to chain more process_* functionsJunio C Hamano2010-09-291-3/+8
| * Merge branch 'en/rename-d-f' into en/merge-recursiveJunio C Hamano2010-09-291-8/+8
| |\
| | * merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirElijah Newren2010-09-091-8/+8
* | | Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano2010-10-261-0/+6
|\ \ \
| * | | merge-recursive: option to specify rename thresholdKevin Ballard2010-09-291-0/+6
* | | | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-261-11/+41
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | merge-recursive: options to ignore whitespace changesJustin Frankel2010-08-271-0/+6
| * | merge-recursive --patienceJustin Frankel2010-08-261-0/+3
| * | ll-merge: replace flag argument with options structJonathan Nieder2010-08-261-11/+11
| * | merge-recursive: expose merge options for builtin mergeJonathan Nieder2010-08-261-0/+21
* | | Merge branch 'ks/recursive-rename-add-identical'Junio C Hamano2010-09-151-0/+6
|\ \ \ | |_|/ |/| |
| * | RE: [PATCH] Avoid rename/add conflict when contents are identicalSchalk, Ken2010-09-031-0/+6
* | | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-031-45/+1
|\ \ \
| * | | setup_unpack_trees_porcelain: take the whole options struct as parameterMatthieu Moy2010-09-031-1/+1
| * | | Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-031-45/+1
* | | | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-031-3/+54
|\ \ \ \ | | |_|/ | |/| |
| * | | merge-recursive --renormalizeJonathan Nieder2010-08-061-1/+1
| * | | ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-061-0/+1
| * | | ll-merge: make flag easier to populateJonathan Nieder2010-08-061-1/+2
| * | | merge-trees: let caller decide whether to renormalizeJonathan Nieder2010-08-061-1/+2
| * | | merge-trees: push choice to renormalize away from low levelJonathan Nieder2010-08-061-4/+5
| * | | Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen2010-07-021-2/+49
* | | | Merge branch 'en/d-f-conflict-fix'Junio C Hamano2010-08-311-19/+88
|\ \ \ \
View Lorry Controller Status