summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
* | | | | Merge branch 'en/merge-recursive'Junio C Hamano2011-04-281-6/+18
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | merge-recursive: tweak magic band-aidJunio C Hamano2011-03-171-1/+8
| * | | | merge-recursive: When we detect we can skip an update, actually skip itElijah Newren2011-03-021-6/+11
* | | | | Fix two unused variable warnings in gcc 4.6Dan McGee2011-04-031-4/+0
| |/ / / |/| | |
* | | | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-191-2/+11
|\ \ \ \
| * | | | merge: enable progress reporting for rename detectionJeff King2011-02-211-0/+1
| * | | | bump rename limit defaults (again)Jeff King2011-02-211-1/+1
| * | | | merge: improve inexact rename limit warningJeff King2011-02-211-1/+9
| | |/ / | |/| |
* | | | Merge branch 'maint'Junio C Hamano2011-03-161-8/+4
|\ \ \ \
| * | | | standardize brace placement in struct definitionsJonathan Nieder2011-03-161-8/+4
| |/ / /
* | | | strbuf: add strbuf_vaddfJeff King2011-02-261-14/+1
|/ / /
* | | Merge branch 'en/merge-recursive'Junio C Hamano2010-11-291-223/+429
|\ \ \ | |/ /
| * | merge-recursive:make_room_for_directories - work around dumb compilersJunio C Hamano2010-10-211-1/+1
| * | merge-recursive: Remove redundant path clearing for D/F conflictsElijah Newren2010-09-291-15/+2
| * | merge-recursive: Make room for directories in D/F conflictsElijah Newren2010-09-291-0/+58
| * | handle_delete_modify(): Check whether D/F conflicts are still presentElijah Newren2010-09-291-9/+16
| * | merge_content(): Check whether D/F conflicts are still presentElijah Newren2010-09-291-2/+20
| * | conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsElijah Newren2010-09-291-4/+3
| * | conflict_rename_delete(): Check whether D/F conflicts are still presentElijah Newren2010-09-291-0/+8
| * | merge-recursive: Delay modify/delete conflicts if D/F conflict presentElijah Newren2010-09-291-0/+9
| * | merge-recursive: Delay content merging for renamesElijah Newren2010-09-291-36/+15
| * | merge-recursive: Delay handling of rename/delete conflictsElijah Newren2010-09-291-2/+20
View Lorry Controller Status