@matheusbsbs / matheus-bagliano
Code Commits 82,027 Issues Pulls Cloud Agent CI/CD
next
bisect jch maint master next seen test todo

fast-import: add a test for tree delta base corruption

Dmitry Ivankov committed about 15 years ago

9a0edb79f2

merge-recursive: Don't re-sort a list whose order we depend upon

Elijah Newren committed about 15 years ago

f701aae077

merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest

Elijah Newren committed about 15 years ago

6d63070cac

t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify

Elijah Newren committed about 15 years ago

b630b81470

merge-recursive: Avoid unnecessary file rewrites

Elijah Newren committed about 15 years ago

35a74abff3

t6022: Additional tests checking for unnecessary updates of files

Elijah Newren committed about 15 years ago

3e333a6146

merge-recursive: Fix spurious 'refusing to lose untracked file...' messages

Elijah Newren committed about 15 years ago

f53d39778c

t6022: Add testcase for spurious "refusing to lose untracked" messages

Elijah Newren committed about 15 years ago

3f680ff0cf

t3030: fix accidental success in symlink rename

Jeff King committed about 15 years ago

814f7d902b

merge-recursive: Fix working copy handling for rename/rename/add/add

Elijah Newren committed about 15 years ago

3672c97148

merge-recursive: add handling for rename/rename/add-dest/add-dest

Elijah Newren committed about 15 years ago

1ac91b32b5

merge-recursive: Have conflict_rename_delete reuse modify/delete code

Elijah Newren committed about 15 years ago

e03acb8bc1

merge-recursive: Make modify/delete handling code reusable

Elijah Newren committed about 15 years ago

b70332520d

merge-recursive: Consider modifications in rename/rename(2to1) conflicts

Elijah Newren committed about 15 years ago

434b8525e7

merge-recursive: Create function for merging with branchname:file markers

Elijah Newren committed about 15 years ago

dac4741554

merge-recursive: Record more data needed for merging with dual renames

Elijah Newren committed about 15 years ago

232c635f7e

merge-recursive: Defer rename/rename(2to1) handling until process_entry

Elijah Newren committed about 15 years ago

461f504117

merge-recursive: Small cleanups for conflict_rename_rename_1to2

Elijah Newren committed about 15 years ago

a99b7f2256

merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base

Elijah Newren committed about 15 years ago

c52ff85d97

merge-recursive: Introduce a merge_file convenience function

Elijah Newren committed about 15 years ago

6bdaead1e5
← Newer Page 2781 of 4102 Older →