t6050-replace: don't disable stdin for the whole test script
SZEDER Gábor committed over 8 years ago
merge: pass aggressive when rename detection is turned off
Ben Peart committed over 8 years ago
merge: add merge.renames config setting
Ben Peart committed over 8 years ago
merge: update documentation for {merge,diff}.renameLimit
Ben Peart committed over 8 years ago
merge-recursive: fix check for skipability of working tree updates
Elijah Newren committed over 8 years ago
merge-recursive: make "Auto-merging" comment show for other merges
Elijah Newren committed over 8 years ago
merge-recursive: fix remainder of was_dirty() to use original index
Elijah Newren committed over 8 years ago
merge-recursive: fix was_tracked() to quit lying with some renamed paths
Elijah Newren committed over 8 years ago
t6046: testcases checking whether updates can be skipped in a merge
Elijah Newren committed over 8 years ago
merge-recursive: avoid triggering add_cacheinfo error with dirty mod
Elijah Newren committed over 8 years ago
merge-recursive: move more is_dirty handling to merge_content
Elijah Newren committed over 8 years ago
merge-recursive: improve add_cacheinfo error handling
Elijah Newren committed over 8 years ago
merge-recursive: avoid spurious rename/rename conflict from dir renames
Elijah Newren committed over 8 years ago
directory rename detection: new testcases showcasing a pair of bugs
Elijah Newren committed over 8 years ago
merge-recursive: fix remaining directory rename + dirty overwrite cases
Elijah Newren committed over 8 years ago
merge-recursive: fix overwriting dirty files involved in renames
Elijah Newren committed over 8 years ago
merge-recursive: avoid clobbering untracked files with directory renames
Elijah Newren committed over 8 years ago
merge-recursive: apply necessary modifications for directory renames
Elijah Newren committed over 8 years ago
merge-recursive: when comparing files, don't include trees
Elijah Newren committed over 8 years ago
merge-recursive: check for file level conflicts then get new name
Elijah Newren committed over 8 years ago