summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-06-18merge-recursive: use xstrdup() instead of fixed bufferRené Scharfe
2018-05-08merge-recursive: fix check for skipability of working tree updatesElijah Newren
2018-05-08merge-recursive: make "Auto-merging" comment show for other mergesElijah Newren
2018-05-08merge-recursive: fix remainder of was_dirty() to use original indexElijah Newren
2018-05-08merge-recursive: fix was_tracked() to quit lying with some renamed pathsElijah Newren
2018-05-08t6046: testcases checking whether updates can be skipped in a mergeElijah Newren
2018-05-08merge-recursive: avoid triggering add_cacheinfo error with dirty modElijah Newren
2018-05-08merge-recursive: move more is_dirty handling to merge_contentElijah Newren
2018-05-08merge-recursive: improve add_cacheinfo error handlingElijah 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: when comparing files, don't include treesElijah Newren
2018-05-08merge-recursive: check for file level conflicts then get new nameElijah Newren
2018-05-08merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren
2018-05-08merge-recursive: check for directory level conflictsElijah Newren
2018-05-08merge-recursive: add get_directory_renames()Elijah Newren
2018-04-20merge-recursive: make a helper function for cleanup for handle_renamesElijah Newren
2018-04-20merge-recursive: split out code for determining diff_filepairsElijah Newren
2018-04-20merge-recursive: make !o->detect_rename codepath more obviousElijah Newren
2018-04-20merge-recursive: fix leaks of allocated renames and diff_filepairsElijah Newren
2018-04-20merge-recursive: introduce new functions to handle rename logicElijah Newren
2018-04-20merge-recursive: move the get_renames() functionElijah 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-11Merge branch 'svn/authors-prog-2' of git://bogomips.org/git-svnJunio C Hamano
2018-04-11Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano
2018-04-11The third batch for 2.18Junio C Hamano
2018-04-11Merge branch 'eb/cred-helper-ignore-sigpipe'Junio C Hamano
2018-04-11Merge branch 'lv/tls-1.3'Junio C Hamano
2018-04-11Merge branch 'pk/test-avoid-pipe-hiding-exit-status'Junio C Hamano
2018-04-11Merge branch 'rs/status-with-removed-submodule'Junio C Hamano
2018-04-11Merge branch 'nd/combined-test-helper'Junio C Hamano
2018-04-11Merge branch 'sb/packfiles-in-repository'Junio C Hamano
2018-04-11Merge branch 'sb/object-store'Junio C Hamano
2018-04-11Merge branch 'jc/test-must-be-empty'Junio C Hamano
2018-04-11Merge branch 'cc/perf-aggregate-sort'Junio C Hamano
2018-04-11Merge branch 'ab/doc-hash-brokenness'Junio C Hamano
generated by cgit v0.10.2-6-g49f6 at 2024-04-27 19:26:49 (GMT)