summaryrefslogtreecommitdiff
path: root/t/t6043-merge-rename-directories.sh
AgeCommit message (Expand)Author
2019-12-01Merge branch 'en/doc-typofix'Junio C Hamano
2019-11-10Fix spelling errors in comments of testcasesElijah Newren
2019-10-23t604[236]: do not run setup in separate testsElijah Newren
2019-10-23merge-recursive: fix merging a subdirectory into the root directoryElijah Newren
2019-08-06merge-recursive: avoid directory rename detection in recursive caseElijah Newren
2019-04-08merge-recursive: switch directory rename detection defaultElijah Newren
2019-04-08t6043: fix copied test description to match its purposeElijah Newren
2018-11-08t6036, t6043: increase code coverage for file collision handlingElijah Newren
2018-11-08merge-recursive: improve rename/rename(1to2)/add[/add] handlingElijah Newren
2018-11-08merge-recursive: improve handling for rename/rename(2to1) conflictsElijah Newren
2018-07-16t6000-t6999: fix broken &&-chainsEric Sunshine
2018-05-08merge-recursive: fix check for skipability of working tree updatesElijah Newren
2018-05-08merge-recursive: avoid spurious rename/rename conflict from dir renamesElijah Newren
2018-05-08directory rename detection: new testcases showcasing a pair of bugsElijah Newren
2018-05-08merge-recursive: fix remaining directory rename + dirty overwrite casesElijah Newren
2018-05-08merge-recursive: fix overwriting dirty files involved in renamesElijah Newren
2018-05-08merge-recursive: avoid clobbering untracked files with directory renamesElijah Newren
2018-05-08merge-recursive: apply necessary modifications for directory renamesElijah Newren
2018-05-08merge-recursive: check for file level conflicts then get new nameElijah Newren
2018-04-20directory rename detection: tests for handling overwriting dirty filesElijah Newren
2018-04-20directory rename detection: tests for handling overwriting untracked filesElijah Newren
2018-04-20directory rename detection: miscellaneous testcases to complete coverageElijah Newren
2018-04-20directory rename detection: testcases exploring possibly suboptimal mergesElijah Newren
2018-04-20directory rename detection: more involved edge/corner testcasesElijah Newren
2018-04-20directory rename detection: testcases checking which side did the renameElijah Newren
2018-04-20directory rename detection: files/directories in the way of some renamesElijah Newren
2018-04-20directory rename detection: partially renamed directory testcase/discussionElijah Newren
2018-04-20directory rename detection: testcases to avoid taking detection too farElijah Newren
2018-04-20directory rename detection: directory splitting testcasesElijah Newren
2018-04-20directory rename detection: basic testcasesElijah Newren
2018-04-11Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano
2018-02-27merge-recursive: ensure we write updates for directory-renamed fileElijah Newren
2018-02-27merge-recursive: avoid spurious rename/rename conflict from dir renamesElijah Newren
2018-02-27directory rename detection: new testcases showcasing a pair of bugsElijah Newren
2018-02-27merge-recursive: fix remaining directory rename + dirty overwrite casesElijah Newren
2018-02-27merge-recursive: fix overwriting dirty files involved in renamesElijah Newren
2018-02-27merge-recursive: avoid clobbering untracked files with directory renamesElijah Newren
2018-02-27merge-recursive: apply necessary modifications for directory renamesElijah Newren
2018-02-14merge-recursive: check for file level conflicts then get new nameElijah Newren
2018-02-14directory rename detection: tests for handling overwriting dirty filesElijah Newren
2018-02-14directory rename detection: tests for handling overwriting untracked filesElijah Newren
2018-02-14directory rename detection: miscellaneous testcases to complete coverageElijah Newren
2018-02-14directory rename detection: testcases exploring possibly suboptimal mergesElijah Newren
2018-02-14directory rename detection: more involved edge/corner testcasesElijah Newren
2018-02-14directory rename detection: testcases checking which side did the renameElijah Newren
2018-02-14directory rename detection: files/directories in the way of some renamesElijah Newren
2018-02-14directory rename detection: partially renamed directory testcase/discussionElijah Newren
2018-02-14directory rename detection: testcases to avoid taking detection too farElijah Newren
2018-02-14directory rename detection: directory splitting testcasesElijah Newren
2018-02-14directory rename detection: basic testcasesElijah Newren
generated by cgit v0.10.2-6-g49f6 at 2024-04-19 21:56:49 (GMT)