25337 Commits (434b8525e7a68893106f6360ff0a261f03c37512)
 

Author SHA1 Message Date
Elijah Newren 434b8525e7 merge-recursive: Consider modifications in rename/rename(2to1) conflicts 14 years ago
Elijah Newren dac4741554 merge-recursive: Create function for merging with branchname:file markers 14 years ago
Elijah Newren 232c635f7e merge-recursive: Record more data needed for merging with dual renames 14 years ago
Elijah Newren 461f504117 merge-recursive: Defer rename/rename(2to1) handling until process_entry 14 years ago
Elijah Newren a99b7f2256 merge-recursive: Small cleanups for conflict_rename_rename_1to2 14 years ago
Elijah Newren c52ff85d97 merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base 14 years ago
Elijah Newren 6bdaead1e5 merge-recursive: Introduce a merge_file convenience function 14 years ago
Elijah Newren ec61d14963 merge-recursive: Fix modify/delete resolution in the recursive case 14 years ago
Elijah Newren 5b448b8530 merge-recursive: When we detect we can skip an update, actually skip it 14 years ago
Elijah Newren 3c217c077a merge-recursive: Provide more info in conflict markers with file renames 14 years ago
Elijah Newren 4f66dade81 merge-recursive: Cleanup and consolidation of rename_conflict_info 14 years ago
Elijah Newren edd2faf52e merge-recursive: Consolidate process_entry() and process_df_entry() 14 years ago
Elijah Newren 51931bf08e merge-recursive: Improve handling of rename target vs. directory addition 14 years ago
Elijah Newren 7769a75e96 merge-recursive: Add comments about handling rename/add-source cases 14 years ago
Elijah Newren 0a6b87126e merge-recursive: Make dead code for rename/rename(2to1) conflicts undead 14 years ago
Elijah Newren 531357a4cc merge-recursive: Fix deletion of untracked file in rename/delete conflicts 14 years ago
Elijah Newren b8ddf16424 merge-recursive: Split update_stages_and_entry; only update stages at end 14 years ago
Elijah Newren ed0148a520 merge-recursive: Allow make_room_for_path() to remove D/F entries 14 years ago
Johannes Sixt 86d4b528d8 string-list: Add API to remove an item from an unsorted list 14 years ago
Elijah Newren aacb82de3f merge-recursive: Split was_tracked() out of would_lose_untracked() 14 years ago
Elijah Newren 70cc3d36eb merge-recursive: Save D/F conflict filenames instead of unlinking them 14 years ago
Elijah Newren f2507b4e0e merge-recursive: Fix code checking for D/F conflicts still being present 14 years ago
Elijah Newren f0fd4d05e8 merge-recursive: Fix sorting order and directory change assumptions 14 years ago
Elijah Newren 7b1c610f84 merge-recursive: Fix recursive case with D/F conflict via add/add conflict 14 years ago
Elijah Newren 0b30e81251 merge-recursive: Avoid working directory changes during recursive case 14 years ago
Elijah Newren 3d6b8e884c merge-recursive: Remember to free generated unique path names 14 years ago
Elijah Newren 650467cf89 merge-recursive: Consolidate different update_stages functions 14 years ago
Elijah Newren 0c05942087 merge-recursive: Mark some diff_filespec struct arguments const 14 years ago
Elijah Newren abafc88e76 merge-recursive: Correct a comment 14 years ago
Elijah Newren c43ba42e8d merge-recursive: Make BUG message more legible by adding a newline 14 years ago
Elijah Newren 7dd9c304be t6022: Add testcase for merging a renamed file with a simple change 14 years ago
Elijah Newren f1a0f457b3 t6022: New tests checking for unnecessary updates of files 14 years ago
Elijah Newren 5b5261baab t6022: Remove unnecessary untracked files to make test cleaner 14 years ago
Elijah Newren 0b35deb378 t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify 14 years ago
Elijah Newren a0d3311624 t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify 14 years ago
Elijah Newren 827f2b7d29 t6036: tests for criss-cross merges with various directory/file conflicts 14 years ago
Elijah Newren 96b079e5c9 t6036: criss-cross with weird content can fool git into clean merge 14 years ago
Elijah Newren fe7e9c23e4 t6036: Add differently resolved modify/delete conflict in criss-cross test 14 years ago
Elijah Newren c6966068fb t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts 14 years ago
Elijah Newren f0b75fcc81 t6042: Ensure rename/rename conflicts leave index and workdir in sane state 14 years ago
Elijah Newren ac6e839241 t6042: Add tests for content issues with modify/rename/directory conflicts 14 years ago
Elijah Newren a0551f212e t6042: Add a testcase where undetected rename causes silent file deletion 14 years ago
Elijah Newren 7b4ed5941c t6042: Add a pair of cases where undetected renames cause issues 14 years ago
Elijah Newren 58040239f5 t6042: Add failing testcase for rename/modify/add-source conflict 14 years ago
Elijah Newren 695576fddd t6042: Add a testcase where git deletes an untracked file 14 years ago
Jim Meyering d8ead15963 fetch: do not leak a refspec 14 years ago
Junio C Hamano e5af0de202 Git 1.7.5.4 14 years ago
Junio C Hamano 1c6e3514d0 Merge branch 'jk/maint-config-alias-fix' into maint 14 years ago
Junio C Hamano 6e1a7510b1 Merge branch 'jc/fmt-req-fix' into maint 14 years ago
Junio C Hamano 2dd798469e Merge branch 'jk/maint-docs' into maint 14 years ago