summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
2011-08-14merge-recursive: Small cleanups for conflict_rename_rename_1to2Elijah Newren
2011-08-14merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseElijah Newren
2011-08-14merge-recursive: Introduce a merge_file convenience functionElijah Newren
2011-08-14merge-recursive: Fix modify/delete resolution in the recursive caseElijah Newren
2011-08-14merge-recursive: When we detect we can skip an update, actually skip itElijah Newren
2011-08-14merge-recursive: Provide more info in conflict markers with file renamesElijah Newren
2011-08-14merge-recursive: Cleanup and consolidation of rename_conflict_infoElijah Newren
2011-08-14merge-recursive: Consolidate process_entry() and process_df_entry()Elijah Newren
2011-08-14merge-recursive: Improve handling of rename target vs. directory additionElijah Newren
2011-08-14merge-recursive: Add comments about handling rename/add-source casesElijah Newren
2011-08-14merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadElijah Newren
2011-08-14merge-recursive: Fix deletion of untracked file in rename/delete conflictsElijah Newren
2011-08-14merge-recursive: Split update_stages_and_entry; only update stages at endElijah Newren
2011-08-14merge-recursive: Allow make_room_for_path() to remove D/F entriesElijah Newren
2011-08-14merge-recursive: Split was_tracked() out of would_lose_untracked()Elijah Newren
2011-08-14merge-recursive: Save D/F conflict filenames instead of unlinking themElijah Newren
2011-08-14merge-recursive: Fix code checking for D/F conflicts still being presentElijah Newren
2011-08-14merge-recursive: Fix sorting order and directory change assumptionsElijah Newren
2011-08-14merge-recursive: Fix recursive case with D/F conflict via add/add conflictElijah Newren
2011-08-14merge-recursive: Avoid working directory changes during recursive caseElijah Newren
2011-08-14merge-recursive: Remember to free generated unique path namesElijah Newren
2011-08-14merge-recursive: Consolidate different update_stages functionsElijah Newren
2011-08-14merge-recursive: Mark some diff_filespec struct arguments constElijah Newren
2011-08-14merge-recursive: Correct a commentElijah Newren
2011-08-14merge-recursive: Make BUG message more legible by adding a newlineElijah Newren
2011-07-12teach --histogram to diffTay Ray Chuan
2011-05-31Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano
2011-05-20Revert "Merge branch 'en/merge-recursive'"Junio C Hamano
2011-05-15Merge branch 'maint'Junio C Hamano
2011-05-15add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder
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
generated by cgit v0.10.2-6-g49f6 at 2024-04-27 06:13:00 (GMT)