summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-01-20merge-ort: implement handle_path_level_conflicts()Libravatar Elijah Newren1-1/+71
2021-01-20merge-ort: implement check_for_directory_rename()Libravatar Elijah Newren1-1/+66
2021-01-20merge-ort: implement apply_dir_rename() and check_dir_renamed()Libravatar Elijah Newren1-2/+35
2021-01-20merge-ort: implement compute_collisions()Libravatar Elijah Newren1-1/+67
2021-01-20merge-ort: modify collect_renames() for directory rename handlingLibravatar Elijah Newren1-4/+74
2021-01-20merge-ort: implement handle_directory_level_conflicts()Libravatar Elijah Newren1-1/+18
2021-01-20merge-ort: implement compute_rename_counts()Libravatar Elijah Newren1-2/+52
2021-01-20merge-ort: copy get_renamed_dir_portion() from merge-recursive.cLibravatar Elijah Newren1-0/+104
2021-01-20merge-ort: add outline of get_provisional_directory_renames()Libravatar Elijah Newren1-1/+56
2021-01-20merge-ort: add outline for computing directory renamesLibravatar Elijah Newren1-1/+24
2021-01-07merge-ort: collect which directories are removed in dirs_removedLibravatar Elijah Newren1-0/+27
2021-01-07merge-ort: initialize and free new directory rename data structuresLibravatar Elijah Newren1-0/+35
2021-01-07merge-ort: add new data structures for directory rename detectionLibravatar Elijah Newren1-3/+31
2021-01-07Merge branch 'en/merge-ort-3' into en/ort-directory-renameLibravatar Junio C Hamano1-16/+430
2021-01-06The first batch in 2.31 cycleLibravatar Junio C Hamano3-2/+34
2021-01-06Merge branch 'es/perf-export-fix'Libravatar Junio C Hamano1-4/+1
2021-01-06Merge branch 'fc/t6030-bisect-reset-removes-auxiliary-files'Libravatar Junio C Hamano1-8/+8
2021-01-06Merge branch 'es/worktree-repair-both-moved'Libravatar Junio C Hamano4-1/+73
2021-01-06Merge branch 'en/merge-ort-recursive'Libravatar Junio C Hamano5-18/+138
2021-01-06Merge branch 'fc/pull-merge-rebase'Libravatar Junio C Hamano2-32/+104
2021-01-06Merge branch 'en/merge-ort-2'Libravatar Junio C Hamano1-19/+191
2021-01-06Merge branch 'en/merge-ort-impl'Libravatar Junio C Hamano4-5/+1256
2021-01-06Merge branch 'tb/pack-bitmap'Libravatar Junio C Hamano10-296/+578
2021-01-06Merge branch 'ab/trailers-extra-format'Libravatar Junio C Hamano5-19/+141
2021-01-06Merge branch 'pk/subsub-fetch-fix-take-2'Libravatar Junio C Hamano2-1/+123
2020-12-27Git 2.30Libravatar Junio C Hamano2-12/+9
2020-12-27Merge branch 'pb/doc-git-linkit-fix'Libravatar Junio C Hamano1-2/+2
2020-12-27Merge tag 'l10n-2.30.0-rnd2' of https://github.com/git-l10n/git-poLibravatar Junio C Hamano12-26547/+53354
2020-12-27l10n: zh_CN: for git v2.30.0 l10n round 1 and 2Libravatar Jiang Xin1-2475/+2588
2020-12-25Merge branch 'l10n/zh_TW/201223' of github.com:l10n-tw/git-poLibravatar Jiang Xin1-2744/+2602
2020-12-25l10n: zh_TW.po: v2.30.0 round 2 (1 untranslated)Libravatar pan934121-2744/+2602
2020-12-23l10n: pl.po: add translation and set team leaderLibravatar Arusekk2-8992/+22386
2020-12-23Git 2.30-rc2Libravatar Junio C Hamano2-1/+6
2020-12-23Merge branch 'nk/refspecs-negative-fix'Libravatar Junio C Hamano2-3/+64
2020-12-23Merge branch 'ma/maintenance-crontab-fix'Libravatar Junio C Hamano3-5/+20
2020-12-23Merge branch 'dl/checkout-p-merge-base'Libravatar Junio C Hamano2-2/+9
2020-12-23Merge branch 'js/no-more-prepare-for-main-in-test'Libravatar Junio C Hamano11-619/+621
2020-12-23Merge branch 'jx/pack-redundant-on-single-pack'Libravatar Junio C Hamano2-4/+39
2020-12-23l10n: pl.po: started Polish translationLibravatar m4sk1n1-0/+12579
2020-12-23l10n: de.po: Update German translation for Git 2.30.0Libravatar Matthias Rüster1-2600/+2729
2020-12-23Merge branch 'master' of github.com:Softcatala/git-poLibravatar Jiang Xin1-1082/+755
2020-12-22t/perf: avoid unnecessary test_export() recursionLibravatar Eric Sunshine1-4/+1
2020-12-22git.txt: fix typos in 'linkgit' macro invocationLibravatar Philippe Blain1-2/+2
2020-12-22l10n: Update Catalan translationLibravatar Jordi Mas1-1082/+755
2020-12-22l10n: bg.po: Updated Bulgarian translation (5037t)Libravatar Alexander Shopov1-2480/+2600
2020-12-21negative-refspec: improve comment on query_matches_negative_refspecLibravatar Nipunn Koorapati1-0/+6
2020-12-21negative-refspec: fix segfault on : refspecLibravatar Nipunn Koorapati2-3/+58
2020-12-22Merge branch 'fr_2.30_rnd2' of github.com:jnavila/gitLibravatar Jiang Xin1-382/+419
2020-12-21t7900-maintenance: test for magic markersLibravatar Martin Ågren1-0/+9
2020-12-21gc: fix handling of crontab magic markersLibravatar Martin Ågren2-4/+10
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 21:46:48 +0000