summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: Do not look at working tree during a virtual ancestor mergeJunio C Hamano2011-09-231-1/+1
* Merge branch 'en/merge-recursive-2'Junio C Hamano2011-09-021-384/+695
|\
| * merge-recursive: Don't re-sort a list whose order we depend uponElijah Newren2011-08-141-4/+12
| * merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destElijah Newren2011-08-141-2/+21
| * merge-recursive: Avoid unnecessary file rewritesElijah Newren2011-08-141-6/+24
| * merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesElijah Newren2011-08-141-14/+20
| * merge-recursive: Fix working copy handling for rename/rename/add/addElijah Newren2011-08-141-25/+48
| * merge-recursive: add handling for rename/rename/add-dest/add-destElijah Newren2011-08-141-2/+19
| * merge-recursive: Have conflict_rename_delete reuse modify/delete codeElijah Newren2011-08-141-16/+30
| * merge-recursive: Make modify/delete handling code reusableElijah Newren2011-08-141-34/+48
| * merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren2011-08-141-9/+21
| * merge-recursive: Create function for merging with branchname:file markersElijah Newren2011-08-141-9/+33
| * merge-recursive: Record more data needed for merging with dual renamesElijah Newren2011-08-141-3/+39
| * merge-recursive: Defer rename/rename(2to1) handling until process_entryElijah Newren2011-08-141-42/+62
| * merge-recursive: Small cleanups for conflict_rename_rename_1to2Elijah Newren2011-08-141-33/+27
| * merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseElijah Newren2011-08-141-17/+13
| * merge-recursive: Introduce a merge_file convenience functionElijah Newren2011-08-141-35/+37
| * merge-recursive: Fix modify/delete resolution in the recursive caseElijah Newren2011-08-141-14/+24
| * merge-recursive: When we detect we can skip an update, actually skip itElijah Newren2011-08-141-3/+16
| * merge-recursive: Provide more info in conflict markers with file renamesElijah Newren2011-08-141-3/+25
| * merge-recursive: Cleanup and consolidation of rename_conflict_infoElijah Newren2011-08-141-68/+66
| * merge-recursive: Consolidate process_entry() and process_df_entry()Elijah Newren2011-08-141-131/+57
| * merge-recursive: Improve handling of rename target vs. directory additionElijah Newren2011-08-141-5/+22
| * merge-recursive: Add comments about handling rename/add-source casesElijah Newren2011-08-141-0/+11
| * merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadElijah Newren2011-08-141-22/+48
| * merge-recursive: Fix deletion of untracked file in rename/delete conflictsElijah Newren2011-08-141-1/+2
| * merge-recursive: Split update_stages_and_entry; only update stages at endElijah Newren2011-08-141-18/+17
| * merge-recursive: Allow make_room_for_path() to remove D/F entriesElijah Newren2011-08-141-4/+22
| * merge-recursive: Split was_tracked() out of would_lose_untracked()Elijah Newren2011-08-141-3/+8
| * merge-recursive: Save D/F conflict filenames instead of unlinking themElijah Newren2011-08-141-16/+24
| * merge-recursive: Fix code checking for D/F conflicts still being presentElijah Newren2011-08-141-15/+34
| * merge-recursive: Fix sorting order and directory change assumptionsElijah Newren2011-08-141-5/+35
| * merge-recursive: Fix recursive case with D/F conflict via add/add conflictElijah Newren2011-08-141-0/+2
| * merge-recursive: Avoid working directory changes during recursive caseElijah Newren2011-08-141-0/+7
| * merge-recursive: Remember to free generated unique path namesElijah Newren2011-08-141-8/+12
| * merge-recursive: Consolidate different update_stages functionsElijah Newren2011-08-141-18/+9
| * merge-recursive: Mark some diff_filespec struct arguments constElijah Newren2011-08-141-9/+10
| * merge-recursive: Correct a commentElijah Newren2011-08-141-1/+1
| * merge-recursive: Make BUG message more legible by adding a newlineElijah Newren2011-08-141-1/+1
| * Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano2011-05-311-7/+3
| |\
* | \ Merge branch 'jn/plug-empty-tree-leak'Junio C Hamano2011-08-251-5/+3
|\ \ \
| * | | merge-recursive: take advantage of hardcoded empty treeJonathan Nieder2011-08-161-5/+3
* | | | teach --histogram to diffTay Ray Chuan2011-07-121-0/+2
* | | | Revert "Merge branch 'en/merge-recursive'"Junio C Hamano2011-05-191-18/+6
* | | | Merge branch 'maint'Junio C Hamano2011-05-141-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-141-3/+3
* | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-061-1/+3
|\ \ \ \
| * | | | Convert read_tree{,_recursive} to support struct pathspecNguyễn Thái Ngọc Duy2011-03-251-1/+3
* | | | | Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano2011-04-281-7/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-221-7/+3
View Lorry Controller Status