@matheusbsbs / matheus-bagliano
Fork 0
Code Commits 81,841 Issues Pulls Cloud Agent CICD
master
bisect jch maint master next seen test todo

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

merge-recursive: Fix modify/delete resolution in the recursive case

Elijah Newren committed about 15 years ago

ec61d14963

merge-recursive: When we detect we can skip an update, actually skip it

Elijah Newren committed about 15 years ago

5b448b8530

merge-recursive: Provide more info in conflict markers with file renames

Elijah Newren committed about 15 years ago

3c217c077a

merge-recursive: Cleanup and consolidation of rename_conflict_info

Elijah Newren committed about 15 years ago

4f66dade81

merge-recursive: Consolidate process_entry() and process_df_entry()

Elijah Newren committed about 15 years ago

edd2faf52e

merge-recursive: Improve handling of rename target vs. directory addition

Elijah Newren committed about 15 years ago

51931bf08e
← Newer Page 2772 of 4093 Older →