summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2011-09-23merge-recursive: Do not look at working tree during a virtual ancestor mergeLibravatar Junio C Hamano1-1/+1
2011-09-02Merge branch 'en/merge-recursive-2'Libravatar Junio C Hamano1-384/+695
2011-08-25Merge branch 'jn/plug-empty-tree-leak'Libravatar Junio C Hamano1-5/+3
2011-08-16merge-recursive: take advantage of hardcoded empty treeLibravatar Jonathan Nieder1-5/+3
2011-08-14merge-recursive: Don't re-sort a list whose order we depend uponLibravatar Elijah Newren1-4/+12
2011-08-14merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destLibravatar Elijah Newren1-2/+21
2011-08-14merge-recursive: Avoid unnecessary file rewritesLibravatar Elijah Newren1-6/+24
2011-08-14merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesLibravatar Elijah Newren1-14/+20
2011-08-14merge-recursive: Fix working copy handling for rename/rename/add/addLibravatar Elijah Newren1-25/+48
2011-08-14merge-recursive: add handling for rename/rename/add-dest/add-destLibravatar Elijah Newren1-2/+19
2011-08-14merge-recursive: Have conflict_rename_delete reuse modify/delete codeLibravatar Elijah Newren1-16/+30
2011-08-14merge-recursive: Make modify/delete handling code reusableLibravatar Elijah Newren1-34/+48
2011-08-14merge-recursive: Consider modifications in rename/rename(2to1) conflictsLibravatar Elijah Newren1-9/+21
2011-08-14merge-recursive: Create function for merging with branchname:file markersLibravatar Elijah Newren1-9/+33
2011-08-14merge-recursive: Record more data needed for merging with dual renamesLibravatar Elijah Newren1-3/+39
2011-08-14merge-recursive: Defer rename/rename(2to1) handling until process_entryLibravatar Elijah Newren1-42/+62
2011-08-14merge-recursive: Small cleanups for conflict_rename_rename_1to2Libravatar Elijah Newren1-33/+27
2011-08-14merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseLibravatar Elijah Newren1-17/+13
2011-08-14merge-recursive: Introduce a merge_file convenience functionLibravatar Elijah Newren1-35/+37
2011-08-14merge-recursive: Fix modify/delete resolution in the recursive caseLibravatar Elijah Newren1-14/+24
2011-08-14merge-recursive: When we detect we can skip an update, actually skip itLibravatar Elijah Newren1-3/+16
2011-08-14merge-recursive: Provide more info in conflict markers with file renamesLibravatar Elijah Newren1-3/+25
2011-08-14merge-recursive: Cleanup and consolidation of rename_conflict_infoLibravatar Elijah Newren1-68/+66
2011-08-14merge-recursive: Consolidate process_entry() and process_df_entry()Libravatar Elijah Newren1-131/+57
2011-08-14merge-recursive: Improve handling of rename target vs. directory additionLibravatar Elijah Newren1-5/+22
2011-08-14merge-recursive: Add comments about handling rename/add-source casesLibravatar Elijah Newren1-0/+11
2011-08-14merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadLibravatar Elijah Newren1-22/+48
2011-08-14merge-recursive: Fix deletion of untracked file in rename/delete conflictsLibravatar Elijah Newren1-1/+2
2011-08-14merge-recursive: Split update_stages_and_entry; only update stages at endLibravatar Elijah Newren1-18/+17
2011-08-14merge-recursive: Allow make_room_for_path() to remove D/F entriesLibravatar Elijah Newren1-4/+22
2011-08-14merge-recursive: Split was_tracked() out of would_lose_untracked()Libravatar Elijah Newren1-3/+8
2011-08-14merge-recursive: Save D/F conflict filenames instead of unlinking themLibravatar Elijah Newren1-16/+24
2011-08-14merge-recursive: Fix code checking for D/F conflicts still being presentLibravatar Elijah Newren1-15/+34
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 00:54:19 +0000