aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/commit.c
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-23 16:27:41 +0000
18-05-08 16:11:00 +0900'>2018-05-08merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren2-3/+150 2018-05-08merge-recursive: check for directory level conflictsElijah Newren1-0/+119 2018-05-08merge-recursive: add get_directory_renames()Elijah Newren2-3/+239 2018-04-20merge-recursive: make a helper function for cleanup for handle_renamesElijah Newren1-10/+13 2018-04-20merge-recursive: split out code for determining diff_filepairsElijah Newren1-22/+62 2018-04-20merge-recursive: make !o->detect_rename codepath more obviousElijah Newren1-2/+9 2018-04-20merge-recursive: fix leaks of allocated renames and diff_filepairsElijah Newren1-5/+15 2018-04-20merge-recursive: introduce new functions to handle rename logicElijah Newren1-10/+33 2018-04-20merge-recursive: move the get_renames() functionElijah Newren1-69/+70 2018-04-20directory rename detection: tests for handling overwriting dirty filesElijah Newren1-0/+458 2018-04-20directory rename detection: tests for handling overwriting untracked filesElijah Newren1-0/+367 2018-04-20directory rename detection: miscellaneous testcases to complete coverageElijah Newren1-1/+564 2018-04-20directory rename detection: testcases exploring possibly suboptimal mergesElijah Newren1-0/+404 2018-04-20directory rename detection: more involved edge/corner testcasesElijah Newren1-0/+396 2018-04-20directory rename detection: testcases checking which side did the renameElijah Newren1-0/+336 2018-04-20directory rename detection: files/directories in the way of some renamesElijah Newren1-0/+330 2018-04-20directory rename detection: partially renamed directory testcase/discussionElijah Newren1-0/+115 2018-04-20directory rename detection: testcases to avoid taking detection too farElijah Newren1-0/+153 2018-04-20directory rename detection: directory splitting testcasesElijah Newren1-0/+143