summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2011-08-14merge-recursive: Fix sorting order and directory change assumptionsLibravatar Elijah Newren1-5/+35
2011-08-14merge-recursive: Fix recursive case with D/F conflict via add/add conflictLibravatar Elijah Newren1-0/+2
2011-08-14merge-recursive: Avoid working directory changes during recursive caseLibravatar Elijah Newren1-0/+7
2011-08-14merge-recursive: Remember to free generated unique path namesLibravatar Elijah Newren1-8/+12
2011-08-14merge-recursive: Consolidate different update_stages functionsLibravatar Elijah Newren1-18/+9
2011-08-14merge-recursive: Mark some diff_filespec struct arguments constLibravatar Elijah Newren1-9/+10
2011-08-14merge-recursive: Correct a commentLibravatar Elijah Newren1-1/+1
2011-08-14merge-recursive: Make BUG message more legible by adding a newlineLibravatar Elijah Newren1-1/+1
2011-07-12teach --histogram to diffLibravatar Tay Ray Chuan1-0/+2
2011-05-31Merge branch 'jc/rename-degrade-cc-to-c' into maintLibravatar Junio C Hamano1-7/+3
2011-05-19Revert "Merge branch 'en/merge-recursive'"Libravatar Junio C Hamano1-18/+6
2011-05-14Merge branch 'maint'Libravatar Junio C Hamano1-3/+3
2011-05-14add, merge, diff: do not use strcasecmp to compare config variable namesLibravatar Jonathan Nieder1-3/+3
2011-05-06Merge branch 'nd/struct-pathspec'Libravatar Junio C Hamano1-1/+3
2011-04-28Merge branch 'jc/rename-degrade-cc-to-c'Libravatar Junio C Hamano1-7/+3
2011-04-28Merge branch 'en/merge-recursive'Libravatar Junio C Hamano1-6/+18
2011-04-03Fix two unused variable warnings in gcc 4.6Libravatar Dan McGee1-4/+0
2011-03-25Convert read_tree{,_recursive} to support struct pathspecLibravatar Nguyễn Thái Ngọc Duy1-1/+3
2011-03-22diffcore-rename: fall back to -C when -C -C busts the rename limitLibravatar Junio C Hamano1-7/+3
2011-03-19Merge branch 'jk/merge-rename-ux'Libravatar Junio C Hamano1-2/+11
2011-03-17merge-recursive: tweak magic band-aidLibravatar Junio C Hamano1-1/+8
2011-03-16Merge branch 'maint'Libravatar Junio C Hamano1-8/+4
2011-03-16standardize brace placement in struct definitionsLibravatar Jonathan Nieder1-8/+4
2011-03-02merge-recursive: When we detect we can skip an update, actually skip itLibravatar Elijah Newren1-6/+11
2011-02-26strbuf: add strbuf_vaddfLibravatar Jeff King1-14/+1
2011-02-21merge: enable progress reporting for rename detectionLibravatar Jeff King1-0/+1
2011-02-21bump rename limit defaults (again)Libravatar Jeff King1-1/+1
2011-02-21merge: improve inexact rename limit warningLibravatar Jeff King1-1/+9
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 13:11:43 +0000