summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-02-14merge-recursive: check for file level conflicts then get new nameElijah Newren
2018-02-14merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren
2018-02-14merge-recursive: check for directory level conflictsElijah Newren
2018-02-14merge-recursive: add get_directory_renames()Elijah Newren
2018-02-14merge-recursive: make a helper function for cleanup for handle_renamesElijah Newren
2018-02-14merge-recursive: split out code for determining diff_filepairsElijah Newren
2018-02-14merge-recursive: make !o->detect_rename codepath more obviousElijah Newren
2018-02-14merge-recursive: fix leaks of allocated renames and diff_filepairsElijah Newren
2018-02-14merge-recursive: introduce new functions to handle rename logicElijah Newren
2018-02-14merge-recursive: move the get_renames() functionElijah Newren
2018-02-14directory rename detection: tests for handling overwriting dirty filesElijah Newren
2018-02-14directory rename detection: tests for handling overwriting untracked filesElijah Newren
2018-02-14directory rename detection: miscellaneous testcases to complete coverageElijah Newren
2018-02-14directory rename detection: testcases exploring possibly suboptimal mergesElijah Newren
2018-02-14directory rename detection: more involved edge/corner testcasesElijah Newren
2018-02-14directory rename detection: testcases checking which side did the renameElijah Newren
2018-02-14directory rename detection: files/directories in the way of some renamesElijah Newren
2018-02-14directory rename detection: partially renamed directory testcase/discussionElijah Newren
2018-02-14directory rename detection: testcases to avoid taking detection too farElijah Newren
2018-02-14directory rename detection: directory splitting testcasesElijah Newren
2018-02-14directory rename detection: basic testcasesElijah Newren
2018-01-19merge-recursive: add explanation for src_entry and dst_entryElijah Newren
2018-01-19merge-recursive: fix logic ordering issueElijah Newren
2018-01-19Tighten and correct a few testcases for merging and cherry-pickingElijah Newren
2018-01-17Git 2.16v2.16.0Junio C Hamano
2018-01-16Merge tag 'l10n-2.16.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano
2018-01-15l10n: de.po: translate 72 new messagesRalf Thielow
2018-01-15l10n: de.po: improve messages when a branch starts to track another refRalf Thielow
2018-01-12RelNotes: minor typofixSZEDER Gábor
2018-01-11Git 2.16-rc2v2.16.0-rc2Junio C Hamano
2018-01-11Merge branch 'jh/object-filtering'Junio C Hamano
2018-01-11Merge branch 'tg/worktree-create-tracking'Junio C Hamano
2018-01-11Merge branch 'js/test-with-ws-in-path'Junio C Hamano
2018-01-11l10n: bg.po: Updated Bulgarian translation (3288t)Alexander Shopov
2018-01-11Documentation/git-worktree.txt: add missing `Ralf Thielow
2018-01-10t3900: add some more quotesBeat Bolli
2018-01-10RelNotes update before -rc2Junio C Hamano
2018-01-10Merge branch 'js/perl-path-workaround-in-tests'Junio C Hamano
2018-01-10Merge branch 'ew/empty-merge-with-dirty-index'Junio C Hamano
2018-01-10Merge branch 'ma/bisect-leakfix'Junio C Hamano
2018-01-10Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'Junio C Hamano
2018-01-10mingw: handle GITPERLLIB in t0021 in a Windows-compatible wayJohannes Schindelin
2018-01-10l10n: TEAMS: add zh_CN team membersJiang Xin
2018-01-10l10n: zh_CN: for git v2.16.0 l10n round 2Jiang Xin
2018-01-10Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin
2018-01-10Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin
2018-01-09Merge branch 'jk/doc-diff-options'Junio C Hamano
2018-01-09Merge branch 'bw/protocol-v1'Junio C Hamano
2018-01-09Merge branch 'sg/travis-check-untracked'Junio C Hamano
2018-01-09Merge branch 'js/test-with-ws-in-path'Junio C Hamano
generated by cgit v0.10.2-6-g49f6 at 2024-04-27 10:21:48 (GMT)