summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-05-08merge-recursive: make "Auto-merging" comment show for other mergesLibravatar Elijah Newren1-26/+39
2018-05-08merge-recursive: fix remainder of was_dirty() to use original indexLibravatar Elijah Newren1-3/+3
2018-05-08merge-recursive: fix was_tracked() to quit lying with some renamed pathsLibravatar Elijah Newren2-24/+68
2018-05-08t6046: testcases checking whether updates can be skipped in a mergeLibravatar Elijah Newren1-0/+761
2018-05-08merge-recursive: avoid triggering add_cacheinfo error with dirty modLibravatar Elijah Newren2-2/+2
2018-05-08merge-recursive: move more is_dirty handling to merge_contentLibravatar Elijah Newren1-18/+12
2018-05-08merge-recursive: improve add_cacheinfo error handlingLibravatar Elijah Newren2-9/+11
2018-05-08merge-recursive: avoid spurious rename/rename conflict from dir renamesLibravatar Elijah Newren2-32/+27
2018-05-08directory rename detection: new testcases showcasing a pair of bugsLibravatar Elijah Newren1-0/+296
2018-05-08merge-recursive: fix remaining directory rename + dirty overwrite casesLibravatar Elijah Newren2-7/+26
2018-05-08merge-recursive: fix overwriting dirty files involved in renamesLibravatar Elijah Newren7-24/+77
2018-05-08merge-recursive: avoid clobbering untracked files with directory renamesLibravatar Elijah Newren2-5/+43
2018-05-08merge-recursive: apply necessary modifications for directory renamesLibravatar Elijah Newren2-26/+211
2018-05-08merge-recursive: when comparing files, don't include treesLibravatar Elijah Newren1-6/+21
2018-05-08merge-recursive: check for file level conflicts then get new nameLibravatar Elijah Newren4-9/+199
2018-05-08merge-recursive: add computation of collisions due to dir rename & mergingLibravatar Elijah Newren2-3/+150
2018-05-08merge-recursive: check for directory level conflictsLibravatar Elijah Newren1-0/+119
2018-05-08merge-recursive: add get_directory_renames()Libravatar Elijah Newren2-3/+239
2018-04-20merge-recursive: make a helper function for cleanup for handle_renamesLibravatar Elijah Newren1-10/+13
2018-04-20merge-recursive: split out code for determining diff_filepairsLibravatar Elijah Newren1-22/+62
2018-04-20merge-recursive: make !o->detect_rename codepath more obviousLibravatar Elijah Newren1-2/+9
2018-04-20merge-recursive: fix leaks of allocated renames and diff_filepairsLibravatar Elijah Newren1-5/+15
2018-04-20merge-recursive: introduce new functions to handle rename logicLibravatar Elijah Newren1-10/+33
2018-04-20merge-recursive: move the get_renames() functionLibravatar Elijah Newren1-69/+70
2018-04-20directory rename detection: tests for handling overwriting dirty filesLibravatar Elijah Newren1-0/+458
2018-04-20directory rename detection: tests for handling overwriting untracked filesLibravatar Elijah Newren1-0/+367
2018-04-20directory rename detection: miscellaneous testcases to complete coverageLibravatar Elijah Newren1-1/+564
2018-04-20directory rename detection: testcases exploring possibly suboptimal mergesLibravatar Elijah Newren1-0/+404
2018-04-20directory rename detection: more involved edge/corner testcasesLibravatar Elijah Newren1-0/+396
2018-04-20directory rename detection: testcases checking which side did the renameLibravatar Elijah Newren1-0/+336
2018-04-20directory rename detection: files/directories in the way of some renamesLibravatar Elijah Newren1-0/+330
2018-04-20directory rename detection: partially renamed directory testcase/discussionLibravatar Elijah Newren1-0/+115
2018-04-20directory rename detection: testcases to avoid taking detection too farLibravatar Elijah Newren1-0/+153
2018-04-20directory rename detection: directory splitting testcasesLibravatar Elijah Newren1-0/+143
2018-04-20directory rename detection: basic testcasesLibravatar Elijah Newren1-0/+442
2018-04-12Merge branch 'svn/authors-prog-2' of git://bogomips.org/git-svnLibravatar Junio C Hamano5-12/+57
2018-04-11Revert "Merge branch 'en/rename-directory-detection'"Libravatar Junio C Hamano9-5197/+115
2018-04-11The third batch for 2.18Libravatar Junio C Hamano1-0/+30
2018-04-11Merge branch 'eb/cred-helper-ignore-sigpipe'Libravatar Junio C Hamano1-0/+3
2018-04-11Merge branch 'lv/tls-1.3'Libravatar Junio C Hamano2-0/+4
2018-04-11Merge branch 'pk/test-avoid-pipe-hiding-exit-status'Libravatar Junio C Hamano15-159/+179
2018-04-11Merge branch 'rs/status-with-removed-submodule'Libravatar Junio C Hamano2-2/+21
2018-04-11Merge branch 'nd/combined-test-helper'Libravatar Junio C Hamano121-542/+684
2018-04-11Merge branch 'sb/packfiles-in-repository'Libravatar Junio C Hamano17-67/+58
2018-04-11Merge branch 'sb/object-store'Libravatar Junio C Hamano39-233/+393
2018-04-11Merge branch 'jc/test-must-be-empty'Libravatar Junio C Hamano1-5/+2
2018-04-11Merge branch 'cc/perf-aggregate-sort'Libravatar Junio C Hamano1-5/+65
2018-04-11Merge branch 'ab/doc-hash-brokenness'Libravatar Junio C Hamano1-8/+32
2018-04-11Merge branch 'bc/hash-independent-tests'Libravatar Junio C Hamano9-82/+100
2018-04-11Merge branch 'ab/drop-contrib-examples'Libravatar Junio C Hamano27-8137/+20
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 07:50:14 +0000