summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* commit.c: Remove backward goto in read_craft_line()Ralf Thielow2010-12-011-6/+7
* Merge branch 'cb/leading-path-removal'Junio C Hamano2010-11-296-135/+215
|\
| * use persistent memory for rejected pathsClemens Buchacher2010-11-154-42/+38
| * do not overwrite files in leading pathClemens Buchacher2010-10-134-10/+31
| * lstat_cache: optionally return match_lenClemens Buchacher2010-10-131-16/+27
| * add function check_ok_to_remove()Clemens Buchacher2010-10-131-49/+58
| * t7607: add leading-path testsClemens Buchacher2010-10-131-0/+51
| * t7607: use test-lib functions and check MERGE_HEADClemens Buchacher2010-10-131-23/+15
* | Merge branch 'en/merge-recursive'Junio C Hamano2010-11-297-240/+1172
|\ \
| * | t6022: Use -eq not = to test output of wc -lBrian Gernhardt2010-11-171-32/+32
| * | 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-292-1/+59
| * | handle_delete_modify(): Check whether D/F conflicts are still presentElijah Newren2010-09-292-10/+17
| * | merge_content(): Check whether D/F conflicts are still presentElijah Newren2010-09-292-6/+24
| * | conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsElijah Newren2010-09-292-5/+4
| * | conflict_rename_delete(): Check whether D/F conflicts are still presentElijah Newren2010-09-292-2/+10
| * | 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-292-37/+16
| * | merge-recursive: Delay handling of rename/delete conflictsElijah Newren2010-09-291-2/+20
| * | merge-recursive: Move handling of double rename of one file to other fileElijah Newren2010-09-291-26/+6
| * | merge-recursive: Move handling of double rename of one file to twoElijah Newren2010-09-292-17/+42
| * | merge-recursive: Avoid doubly merging rename/add conflict contentsElijah Newren2010-09-292-2/+3
| * | merge-recursive: Update merge_content() call signatureElijah Newren2010-09-291-2/+4
| * | merge-recursive: Update conflict_rename_rename_1to2() call signatureElijah Newren2010-09-291-9/+9
| * | merge-recursive: Structure process_df_entry() to handle more casesElijah Newren2010-09-291-36/+47
| * | merge-recursive: Have process_entry() skip D/F or rename entriesElijah Newren2010-09-291-0/+3
| * | merge-recursive: New function to assist resolving renames in-core onlyElijah Newren2010-09-291-3/+30
| * | merge-recursive: New data structures for deferring of D/F conflictsElijah Newren2010-09-291-0/+44
| * | merge-recursive: Move process_entry's content merging into a functionElijah Newren2010-09-291-28/+43
| * | merge-recursive: Move delete/modify handling into dedicated functionElijah Newren2010-09-291-13/+22
| * | merge-recursive: Move rename/delete handling into dedicated functionElijah Newren2010-09-291-11/+20
| * | merge-recursive: Nuke rename/directory conflict detectionElijah Newren2010-09-291-18/+0
| * | merge-recursive: Rename conflict_rename_rename*() for clarityElijah Newren2010-09-291-12/+14
| * | merge-recursive: Small code clarification -- variable name and commentsElijah Newren2010-09-291-6/+14
| * | t6036: Add testcase for undetected conflictElijah Newren2010-09-291-0/+85
| * | t6036: Add a second testcase similar to the first but with content changesElijah Newren2010-09-291-0/+76
| * | t6036: Test index and worktree state, not just that merge failsElijah Newren2010-09-291-3/+21
| * | t6020: Add a testcase for modify/delete + directory/file conflictElijah Newren2010-09-291-0/+47
| * | t6020: Modernize style a bitElijah Newren2010-09-291-15/+20
| * | t6022: Add tests for rename/rename combined with D/F conflictsElijah Newren2010-09-291-0/+79
| * | t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)Elijah Newren2010-09-291-0/+63
| * | t6022: Add tests with both rename source & dest involved in D/F conflictsElijah Newren2010-09-291-0/+38
| * | t6022: Add tests for reversing order of merges when D/F conflicts presentElijah Newren2010-09-291-0/+58
| * | t6022: Add test combinations of {content conflict?, D/F conflict remains?}Elijah Newren2010-09-291-0/+128
| * | t6032: Add a test checking for excessive output from mergeElijah Newren2010-09-291-0/+30
| * | merge-recursive: Restructure showing how to chain more process_* functionsJunio C Hamano2010-09-291-3/+8
| * | t3030: Add a testcase for resolvable rename/add conflict with symlinksSchalk, Ken2010-09-291-1/+36
| * | Merge branch 'en/rename-d-f' into en/merge-recursiveJunio C Hamano2010-09-292-8/+74
| |\ \
| | * | merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirElijah Newren2010-09-092-10/+10
View Lorry Controller Status