summaryrefslogtreecommitdiff
path: root/t/t6043-merge-rename-directories.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/doc-typofix'Junio C Hamano2019-12-011-3/+3
|\
| * Fix spelling errors in comments of testcasesElijah Newren2019-11-101-3/+3
* | t604[236]: do not run setup in separate testsElijah Newren2019-10-231-202/+264
* | merge-recursive: fix merging a subdirectory into the root directoryElijah Newren2019-10-231-0/+114
|/
* merge-recursive: avoid directory rename detection in recursive caseElijah Newren2019-08-061-0/+111
* merge-recursive: switch directory rename detection defaultElijah Newren2019-04-081-53/+405
* t6043: fix copied test description to match its purposeElijah Newren2019-04-081-2/+2
* t6036, t6043: increase code coverage for file collision handlingElijah Newren2018-11-081-0/+37
* merge-recursive: improve rename/rename(1to2)/add[/add] handlingElijah Newren2018-11-081-9/+15
* merge-recursive: improve handling for rename/rename(2to1) conflictsElijah Newren2018-11-081-35/+48
* t6000-t6999: fix broken &&-chainsEric Sunshine2018-07-161-1/+1
* merge-recursive: fix check for skipability of working tree updatesElijah Newren2018-05-081-1/+1
* merge-recursive: avoid spurious rename/rename conflict from dir renamesElijah Newren2018-05-081-30/+25
* directory rename detection: new testcases showcasing a pair of bugsElijah Newren2018-05-081-0/+296
* merge-recursive: fix remaining directory rename + dirty overwrite casesElijah Newren2018-05-081-4/+4
* merge-recursive: fix overwriting dirty files involved in renamesElijah Newren2018-05-081-1/+1
* merge-recursive: avoid clobbering untracked files with directory renamesElijah Newren2018-05-081-3/+3
* merge-recursive: apply necessary modifications for directory renamesElijah Newren2018-05-081-25/+25
* merge-recursive: check for file level conflicts then get new nameElijah Newren2018-05-081-1/+1
* directory rename detection: tests for handling overwriting dirty filesElijah Newren2018-04-201-0/+458
* directory rename detection: tests for handling overwriting untracked filesElijah Newren2018-04-201-0/+367
* directory rename detection: miscellaneous testcases to complete coverageElijah Newren2018-04-201-1/+564
* directory rename detection: testcases exploring possibly suboptimal mergesElijah Newren2018-04-201-0/+404
* directory rename detection: more involved edge/corner testcasesElijah Newren2018-04-201-0/+396
* directory rename detection: testcases checking which side did the renameElijah Newren2018-04-201-0/+336
* directory rename detection: files/directories in the way of some renamesElijah Newren2018-04-201-0/+330
* directory rename detection: partially renamed directory testcase/discussionElijah Newren2018-04-201-0/+115
* directory rename detection: testcases to avoid taking detection too farElijah Newren2018-04-201-0/+153
* directory rename detection: directory splitting testcasesElijah Newren2018-04-201-0/+143
* directory rename detection: basic testcasesElijah Newren2018-04-201-0/+442
* Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano2018-04-111-3998/+0
* merge-recursive: ensure we write updates for directory-renamed fileen/rename-directory-detectionElijah Newren2018-02-271-1/+1
* merge-recursive: avoid spurious rename/rename conflict from dir renamesElijah Newren2018-02-271-30/+25
* directory rename detection: new testcases showcasing a pair of bugsElijah Newren2018-02-271-0/+296
* merge-recursive: fix remaining directory rename + dirty overwrite casesElijah Newren2018-02-271-4/+4
* merge-recursive: fix overwriting dirty files involved in renamesElijah Newren2018-02-271-1/+1
* merge-recursive: avoid clobbering untracked files with directory renamesElijah Newren2018-02-271-3/+3
* merge-recursive: apply necessary modifications for directory renamesElijah Newren2018-02-271-25/+25
* merge-recursive: check for file level conflicts then get new nameElijah Newren2018-02-141-1/+1
* directory rename detection: tests for handling overwriting dirty filesElijah Newren2018-02-141-0/+458
* directory rename detection: tests for handling overwriting untracked filesElijah Newren2018-02-141-0/+367
* directory rename detection: miscellaneous testcases to complete coverageElijah Newren2018-02-141-1/+564
* directory rename detection: testcases exploring possibly suboptimal mergesElijah Newren2018-02-141-0/+404
* directory rename detection: more involved edge/corner testcasesElijah Newren2018-02-141-0/+396
* directory rename detection: testcases checking which side did the renameElijah Newren2018-02-141-0/+336
* directory rename detection: files/directories in the way of some renamesElijah Newren2018-02-141-0/+330
* directory rename detection: partially renamed directory testcase/discussionElijah Newren2018-02-141-0/+115
* directory rename detection: testcases to avoid taking detection too farElijah Newren2018-02-141-0/+153
* directory rename detection: directory splitting testcasesElijah Newren2018-02-141-0/+143
* directory rename detection: basic testcasesElijah Newren2018-02-141-0/+442
View Lorry Controller Status