summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-02-27merge-recursive: apply necessary modifications for directory renamesLibravatar Elijah Newren2-26/+211
2018-02-14merge-recursive: when comparing files, don't include treesLibravatar Elijah Newren1-6/+21
2018-02-14merge-recursive: check for file level conflicts then get new nameLibravatar Elijah Newren4-9/+199
2018-02-14merge-recursive: add computation of collisions due to dir rename & mergingLibravatar Elijah Newren2-3/+150
2018-02-14merge-recursive: check for directory level conflictsLibravatar Elijah Newren1-0/+119
2018-02-14merge-recursive: add get_directory_renames()Libravatar Elijah Newren2-3/+239
2018-02-14merge-recursive: make a helper function for cleanup for handle_renamesLibravatar Elijah Newren1-10/+13
2018-02-14merge-recursive: split out code for determining diff_filepairsLibravatar Elijah Newren1-22/+62
2018-02-14merge-recursive: make !o->detect_rename codepath more obviousLibravatar Elijah Newren1-2/+9
2018-02-14merge-recursive: fix leaks of allocated renames and diff_filepairsLibravatar Elijah Newren1-5/+15
2018-02-14merge-recursive: introduce new functions to handle rename logicLibravatar Elijah Newren1-10/+33
2018-02-14merge-recursive: move the get_renames() functionLibravatar Elijah Newren1-69/+70
2018-02-14directory rename detection: tests for handling overwriting dirty filesLibravatar Elijah Newren1-0/+458
2018-02-14directory rename detection: tests for handling overwriting untracked filesLibravatar Elijah Newren1-0/+367
2018-02-14directory rename detection: miscellaneous testcases to complete coverageLibravatar Elijah Newren1-1/+564
2018-02-14directory rename detection: testcases exploring possibly suboptimal mergesLibravatar Elijah Newren1-0/+404
2018-02-14directory rename detection: more involved edge/corner testcasesLibravatar Elijah Newren1-0/+396
2018-02-14directory rename detection: testcases checking which side did the renameLibravatar Elijah Newren1-0/+336
2018-02-14directory rename detection: files/directories in the way of some renamesLibravatar Elijah Newren1-0/+330
2018-02-14directory rename detection: partially renamed directory testcase/discussionLibravatar Elijah Newren1-0/+115
2018-02-14directory rename detection: testcases to avoid taking detection too farLibravatar Elijah Newren1-0/+153
2018-02-14directory rename detection: directory splitting testcasesLibravatar Elijah Newren1-0/+143
2018-02-14directory rename detection: basic testcasesLibravatar Elijah Newren1-0/+442
2018-01-19merge-recursive: add explanation for src_entry and dst_entryLibravatar Elijah Newren1-0/+19
2018-01-19merge-recursive: fix logic ordering issueLibravatar Elijah Newren1-1/+1
2018-01-19Tighten and correct a few testcases for merging and cherry-pickingLibravatar Elijah Newren2-3/+9
2018-01-17Git 2.16Libravatar Junio C Hamano2-3/+6
2018-01-16Merge tag 'l10n-2.16.0-rnd2' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano12-20028/+22202
2018-01-15l10n: de.po: translate 72 new messagesLibravatar Ralf Thielow1-1934/+2172
2018-01-15l10n: de.po: improve messages when a branch starts to track another refLibravatar Ralf Thielow1-8/+8
2018-01-12RelNotes: minor typofixLibravatar SZEDER Gábor1-1/+1
2018-01-11Git 2.16-rc2Libravatar Junio C Hamano1-1/+1
2018-01-11Merge branch 'jh/object-filtering'Libravatar Junio C Hamano1-1/+1
2018-01-11Merge branch 'tg/worktree-create-tracking'Libravatar Junio C Hamano1-1/+1
2018-01-11Merge branch 'js/test-with-ws-in-path'Libravatar Junio C Hamano1-4/+4
2018-01-11l10n: bg.po: Updated Bulgarian translation (3288t)Libravatar Alexander Shopov1-181/+203
2018-01-11Documentation/git-worktree.txt: add missing `Libravatar Ralf Thielow1-1/+1
2018-01-10t3900: add some more quotesLibravatar Beat Bolli1-4/+4
2018-01-10RelNotes update before -rc2Libravatar Junio C Hamano1-0/+10
2018-01-10Merge branch 'js/perl-path-workaround-in-tests'Libravatar Junio C Hamano1-1/+16
2018-01-10Merge branch 'ew/empty-merge-with-dirty-index'Libravatar Junio C Hamano2-1/+51
2018-01-10Merge branch 'ma/bisect-leakfix'Libravatar Junio C Hamano1-2/+4
2018-01-10Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'Libravatar Junio C Hamano2-3/+20
2018-01-10mingw: handle GITPERLLIB in t0021 in a Windows-compatible wayLibravatar Johannes Schindelin1-1/+16
2018-01-10l10n: TEAMS: add zh_CN team membersLibravatar Jiang Xin1-0/+1
2018-01-10l10n: zh_CN: for git v2.16.0 l10n round 2Libravatar Jiang Xin1-1920/+2144
2018-01-10Merge branch 'master' of git://github.com/nafmo/git-l10n-svLibravatar Jiang Xin1-181/+197
2018-01-10Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruLibravatar Jiang Xin1-1918/+2092
2018-01-09Merge branch 'jk/doc-diff-options'Libravatar Junio C Hamano1-0/+6
2018-01-09Merge branch 'bw/protocol-v1'Libravatar Junio C Hamano1-6/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 19:01:13 +0000