summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2018-04-10The second batch for 2.18Libravatar Junio C Hamano1-0/+25
2018-04-10Merge branch 'ys/bisect-object-id-missing-conversion-fix'Libravatar Junio C Hamano1-2/+2
2018-04-10Merge branch 'yk/filter-branch-non-committish-refs'Libravatar Junio C Hamano2-2/+26
2018-04-10Merge branch 'nd/trace-with-env'Libravatar Junio C Hamano1-1/+1
2018-04-10Merge branch 'nd/parseopt-completion-more'Libravatar Junio C Hamano3-76/+127
2018-04-10Merge branch 'ds/bsearch-hash'Libravatar Junio C Hamano3-57/+42
2018-04-10Merge branch 'ws/rebase-p'Libravatar Junio C Hamano4-214/+216
2018-04-10Merge branch 'jk/diff-highlight-graph-fix'Libravatar Junio C Hamano2-37/+129
2018-04-10Merge branch 'nd/remove-ignore-env-field'Libravatar Junio C Hamano7-65/+101
2018-04-10Merge branch 'ps/contains-id-error-message'Libravatar Junio C Hamano8-14/+125
2018-04-10The first batch for 2.18 cycleLibravatar Junio C Hamano3-2/+69
2018-04-10Merge branch 'tg/stash-untracked-with-pathspec-fix'Libravatar Junio C Hamano2-6/+60
2018-04-10Merge branch 'nd/worktree-prune'Libravatar Junio C Hamano4-27/+24
2018-04-10Merge branch 'bc/object-id'Libravatar Junio C Hamano111-594/+609
2018-04-10Merge branch 'ma/shortlog-revparse'Libravatar Junio C Hamano3-2/+13
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 21:10:53 +0000