summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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 Newren2-18/+14
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 Newren2-16/+26
2011-08-14merge-recursive: When we detect we can skip an update, actually skip itLibravatar Elijah Newren2-5/+18
2011-08-14merge-recursive: Provide more info in conflict markers with file renamesLibravatar Elijah Newren3-8/+97
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 Newren3-8/+25
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 Newren2-30/+57
2011-08-14merge-recursive: Fix deletion of untracked file in rename/delete conflictsLibravatar Elijah Newren2-2/+3
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 Newren2-5/+23
2011-08-14string-list: Add API to remove an item from an unsorted listLibravatar Johannes Sixt3-0/+20
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 Newren2-16/+25
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 Newren2-13/+53
2011-08-14merge-recursive: Fix recursive case with D/F conflict via add/add conflictLibravatar Elijah Newren2-2/+4
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-08-14t6022: Add testcase for merging a renamed file with a simple changeLibravatar Elijah Newren1-0/+27
2011-08-14t6022: New tests checking for unnecessary updates of filesLibravatar Elijah Newren1-0/+63
2011-08-14t6022: Remove unnecessary untracked files to make test cleanerLibravatar Elijah Newren1-0/+1
2011-08-14t6036: criss-cross + rename/rename(1to2)/add-source + modify/modifyLibravatar Elijah Newren1-0/+77
2011-08-14t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modifyLibravatar Elijah Newren1-0/+88
2011-08-14t6036: tests for criss-cross merges with various directory/file conflictsLibravatar Elijah Newren1-0/+159
2011-08-14t6036: criss-cross with weird content can fool git into clean mergeLibravatar Elijah Newren1-0/+83
2011-08-14t6036: Add differently resolved modify/delete conflict in criss-cross testLibravatar Elijah Newren1-0/+83
2011-08-14t6042: Add failing testcases for rename/rename/add-{source,dest} conflictsLibravatar Elijah Newren1-0/+125
2011-08-14t6042: Ensure rename/rename conflicts leave index and workdir in sane stateLibravatar Elijah Newren1-0/+102
2011-08-14t6042: Add tests for content issues with modify/rename/directory conflictsLibravatar Elijah Newren1-0/+141
2011-08-14t6042: Add a testcase where undetected rename causes silent file deletionLibravatar Elijah Newren1-0/+65
2011-08-14t6042: Add a pair of cases where undetected renames cause issuesLibravatar Elijah Newren1-0/+61
2011-08-14t6042: Add failing testcase for rename/modify/add-source conflictLibravatar Elijah Newren1-0/+39
2011-08-14t6042: Add a testcase where git deletes an untracked fileLibravatar Elijah Newren2-1/+37
2011-06-08fetch: do not leak a refspecLibravatar Jim Meyering1-2/+4
2011-06-01Git 1.7.5.4Libravatar Junio C Hamano3-2/+6
2011-06-01Merge branch 'jk/maint-config-alias-fix' into maintLibravatar Junio C Hamano4-48/+30
2011-06-01Merge branch 'jc/fmt-req-fix' into maintLibravatar Junio C Hamano1-1/+1
2011-06-01Merge branch 'jk/maint-docs' into maintLibravatar Junio C Hamano4-15/+35
2011-06-01Merge branch 'jn/doc-remote-helpers' into maintLibravatar Junio C Hamano1-3/+3
2011-06-01Merge branch 'kk/maint-prefix-in-config-mak' into maintLibravatar Junio C Hamano1-0/+1
2011-06-01diffcore-rename.c: avoid set-but-not-used warningLibravatar Jim Meyering1-2/+1
2011-05-31Start 1.7.5.4 draft release notesLibravatar Junio C Hamano2-1/+19
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 14:07:34 +0000