Change parse_attr() to take a pointer to struct attr_state
Michael Haggerty committed about 15 years ago
Increment num_attr in parse_attr_line(), not parse_attr()
Michael Haggerty committed about 15 years ago
Michael Haggerty committed about 15 years ago
Michael Haggerty committed about 15 years ago
fast-import: prevent producing bad delta
Dmitry Ivankov committed about 15 years ago
fast-import: add a test for tree delta base corruption
Dmitry Ivankov committed about 15 years ago
merge-recursive: Don't re-sort a list whose order we depend upon
Elijah Newren committed about 15 years ago
merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
Elijah Newren committed about 15 years ago
t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify
Elijah Newren committed about 15 years ago
merge-recursive: Avoid unnecessary file rewrites
Elijah Newren committed about 15 years ago
t6022: Additional tests checking for unnecessary updates of files
Elijah Newren committed about 15 years ago
merge-recursive: Fix spurious 'refusing to lose untracked file...' messages
Elijah Newren committed about 15 years ago
t6022: Add testcase for spurious "refusing to lose untracked" messages
Elijah Newren committed about 15 years ago
t3030: fix accidental success in symlink rename
Jeff King committed about 15 years ago
merge-recursive: Fix working copy handling for rename/rename/add/add
Elijah Newren committed about 15 years ago
merge-recursive: add handling for rename/rename/add-dest/add-dest
Elijah Newren committed about 15 years ago
merge-recursive: Have conflict_rename_delete reuse modify/delete code
Elijah Newren committed about 15 years ago
merge-recursive: Make modify/delete handling code reusable
Elijah Newren committed about 15 years ago
merge-recursive: Consider modifications in rename/rename(2to1) conflicts
Elijah Newren committed about 15 years ago
merge-recursive: Create function for merging with branchname:file markers
Elijah Newren committed about 15 years ago