summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
2011-05-06Merge branch 'nd/struct-pathspec'Junio C Hamano
2011-04-28Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano
2011-04-28Merge branch 'en/merge-recursive'Junio C Hamano
2011-04-03Fix two unused variable warnings in gcc 4.6Dan McGee
2011-03-25Convert read_tree{,_recursive} to support struct pathspecNguyễn Thái Ngọc Duy
2011-03-22diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano
2011-03-20Merge branch 'jk/merge-rename-ux'Junio C Hamano
2011-03-18merge-recursive: tweak magic band-aidJunio C Hamano
2011-03-16Merge branch 'maint'Junio C Hamano
2011-03-16standardize brace placement in struct definitionsJonathan Nieder
2011-03-02merge-recursive: When we detect we can skip an update, actually skip itElijah Newren
2011-02-26strbuf: add strbuf_vaddfJeff King
2011-02-21merge: enable progress reporting for rename detectionJeff King
2011-02-21bump rename limit defaults (again)Jeff King
2011-02-21merge: improve inexact rename limit warningJeff King
2010-11-30Merge branch 'en/merge-recursive'Junio C Hamano
2010-10-27Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano
2010-10-27Merge branch 'jf/merge-ignore-ws'Junio C Hamano
2010-10-21merge-recursive:make_room_for_directories - work around dumb compilersJunio C Hamano
2010-09-30merge-recursive: Remove redundant path clearing for D/F conflictsElijah Newren
2010-09-30merge-recursive: Make room for directories in D/F conflictsElijah Newren
2010-09-30handle_delete_modify(): Check whether D/F conflicts are still presentElijah Newren
2010-09-30merge_content(): Check whether D/F conflicts are still presentElijah Newren
2010-09-30conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsElijah Newren
2010-09-30conflict_rename_delete(): Check whether D/F conflicts are still presentElijah Newren
2010-09-30merge-recursive: Delay modify/delete conflicts if D/F conflict presentElijah Newren
2010-09-30merge-recursive: Delay content merging for renamesElijah Newren
2010-09-30merge-recursive: Delay handling of rename/delete conflictsElijah Newren
2010-09-30merge-recursive: Move handling of double rename of one file to other fileElijah Newren
2010-09-30merge-recursive: Move handling of double rename of one file to twoElijah Newren
2010-09-30merge-recursive: Avoid doubly merging rename/add conflict contentsElijah Newren
2010-09-30merge-recursive: Update merge_content() call signatureElijah Newren
2010-09-30merge-recursive: Update conflict_rename_rename_1to2() call signatureElijah Newren
2010-09-30merge-recursive: Structure process_df_entry() to handle more casesElijah Newren
2010-09-30merge-recursive: Have process_entry() skip D/F or rename entriesElijah Newren
2010-09-30merge-recursive: New function to assist resolving renames in-core onlyElijah Newren
2010-09-30merge-recursive: New data structures for deferring of D/F conflictsElijah Newren
2010-09-30merge-recursive: Move process_entry's content merging into a functionElijah Newren
2010-09-30merge-recursive: Move delete/modify handling into dedicated functionElijah Newren
2010-09-30merge-recursive: Move rename/delete handling into dedicated functionElijah Newren
2010-09-30merge-recursive: Nuke rename/directory conflict detectionElijah Newren
2010-09-30merge-recursive: Rename conflict_rename_rename*() for clarityElijah Newren
2010-09-30merge-recursive: Small code clarification -- variable name and commentsElijah Newren
2010-09-30merge-recursive: Restructure showing how to chain more process_* functionsJunio C Hamano
2010-09-30Merge branch 'en/rename-d-f' into en/merge-recursiveJunio C Hamano
2010-09-29merge-recursive: option to specify rename thresholdKevin Ballard
2010-09-15Merge branch 'ks/recursive-rename-add-identical'Junio C Hamano
2010-09-10merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirElijah Newren
2010-09-04Merge branch 'dg/local-mod-error-messages'Junio C Hamano
2010-09-03RE: [PATCH] Avoid rename/add conflict when contents are identicalSchalk, Ken
generated by cgit v0.10.2-6-g49f6 at 2024-04-16 09:51:57 (GMT)