summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: ensure we write updates for directory-renamed fileen/rename-directory-detectionElijah Newren2018-02-272-4/+2
* merge-recursive: avoid spurious rename/rename conflict from dir renamesElijah Newren2018-02-272-32/+27
* directory rename detection: new testcases showcasing a pair of bugsElijah Newren2018-02-271-0/+296
* merge-recursive: fix remaining directory rename + dirty overwrite casesElijah Newren2018-02-272-7/+26
* merge-recursive: fix overwriting dirty files involved in renamesElijah Newren2018-02-277-24/+77
* merge-recursive: avoid clobbering untracked files with directory renamesElijah Newren2018-02-272-5/+43
* merge-recursive: apply necessary modifications for directory renamesElijah Newren2018-02-272-26/+211
* merge-recursive: when comparing files, don't include treesElijah Newren2018-02-141-6/+21
* merge-recursive: check for file level conflicts then get new nameElijah Newren2018-02-144-9/+199
* merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren2018-02-142-3/+150
* merge-recursive: check for directory level conflictsElijah Newren2018-02-141-0/+119
* merge-recursive: add get_directory_renames()Elijah Newren2018-02-142-3/+239
* merge-recursive: make a helper function for cleanup for handle_renamesElijah Newren2018-02-141-10/+13
* merge-recursive: split out code for determining diff_filepairsElijah Newren2018-02-141-22/+62
* merge-recursive: make !o->detect_rename codepath more obviousElijah Newren2018-02-141-2/+9
* merge-recursive: fix leaks of allocated renames and diff_filepairsElijah Newren2018-02-141-5/+15
* merge-recursive: introduce new functions to handle rename logicElijah Newren2018-02-141-10/+33
* merge-recursive: move the get_renames() functionElijah Newren2018-02-141-69/+70
* directory rename detection: tests for handling overwriting dirty filesElijah Newren2018-02-141-0/+458
* directory rename detection: tests for handling overwriting untracked filesElijah Newren2018-02-141-0/+367
* directory rename detection: miscellaneous testcases to complete coverageElijah Newren2018-02-141-1/+564
* directory rename detection: testcases exploring possibly suboptimal mergesElijah Newren2018-02-141-0/+404
* directory rename detection: more involved edge/corner testcasesElijah Newren2018-02-141-0/+396
* directory rename detection: testcases checking which side did the renameElijah Newren2018-02-141-0/+336
* directory rename detection: files/directories in the way of some renamesElijah Newren2018-02-141-0/+330
* directory rename detection: partially renamed directory testcase/discussionElijah Newren2018-02-141-0/+115
* directory rename detection: testcases to avoid taking detection too farElijah Newren2018-02-141-0/+153
* directory rename detection: directory splitting testcasesElijah Newren2018-02-141-0/+143
* directory rename detection: basic testcasesElijah Newren2018-02-141-0/+442
* merge-recursive: add explanation for src_entry and dst_entryen/merge-recursive-fixesElijah Newren2018-01-191-0/+19
* merge-recursive: fix logic ordering issueElijah Newren2018-01-191-1/+1
* Tighten and correct a few testcases for merging and cherry-pickingElijah Newren2018-01-192-3/+9
* Git 2.16v2.16.0Junio C Hamano2018-01-172-3/+6
* Merge tag 'l10n-2.16.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2018-01-1612-20028/+22202
|\
| * l10n: de.po: translate 72 new messagesRalf Thielow2018-01-151-1934/+2172
| * l10n: de.po: improve messages when a branch starts to track another refRalf Thielow2018-01-151-8/+8
| * l10n: bg.po: Updated Bulgarian translation (3288t)Alexander Shopov2018-01-111-181/+203
| * l10n: TEAMS: add zh_CN team membersJiang Xin2018-01-101-0/+1
| * l10n: zh_CN: for git v2.16.0 l10n round 2Jiang Xin2018-01-101-1920/+2144
| * Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2018-01-101-181/+197
| |\
| | * l10n: sv.po: Update Swedish translation (3288t0f0u)Peter Krefting2018-01-091-181/+197
| * | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2018-01-101-1918/+2092
| |\ \
| | * | l10n: ru.po: update Russian translationDimitriy Ryazantcev2018-01-091-1918/+2092
| | |/
| * | l10n: TEAMS: Add ko team membersChangwoo Ryu2018-01-091-0/+2
| |/
| * Merge branch 'ko/merge-l10n' of https://github.com/git-l10n-ko/git-l10n-koJiang Xin2018-01-092-1944/+2200
| |\
| | * l10n: ko.po: Update Korean translationChangwoo Ryu2018-01-082-1944/+2200
| * | Merge branch '2.16' of https://github.com/ChrisADR/git-poJiang Xin2018-01-081-181/+197
| |\ \
| | * | l10n: es.po: Spanish translation 2.16.0 round 2Christopher Díaz Riveros2018-01-071-181/+197
| | |/
| * | Merge branch 'fr_2.16-rc1' of git://github.com/jnavila/gitJiang Xin2018-01-081-192/+225
| |\ \
| | * | l10n: fr.po 2.16 round 2Jean-Noel Avila2018-01-071-192/+225
| | |/
View Lorry Controller Status