summaryrefslogtreecommitdiffstats
path: root/builtin/merge.c (unfollow)
Commit message (Expand)AuthorFilesLines
2021-08-09object-store: avoid extra ';' from KHASH_INITCarlo Marcelo Arenas Belón1-1/+1
2021-08-09oidtree: avoid nested struct oidtree_nodeCarlo Marcelo Arenas Belón1-8/+3
2021-08-09l10n: vi.po(5227t): Updated Vietnamese translation for v2.32.0Tran Ngoc Quan1-1963/+2089
2021-08-06Git 2.33-rc1v2.33.0-rc1Junio C Hamano1-1/+1
2021-08-06test: fix for COLUMNS and bash 5Felipe Contreras1-0/+6
2021-08-06l10n: bg.po: Updated Bulgarian translation (5227t)Alexander Shopov1-1953/+2075
2021-08-06Update docs for change of default merge backendElijah Newren5-60/+67
2021-08-06Change default merge backend from recursive to ortElijah Newren3-5/+11
2021-08-05Update error message and code commentElijah Newren2-2/+2
2021-08-05merge-strategies.txt: add coverage of the `ort` merge strategyElijah Newren1-0/+14
2021-08-05git-rebase.txt: correct out-of-date and misleading text about renamesElijah Newren1-3/+1
2021-08-05merge-strategies.txt: fix simple capitalization errorElijah Newren1-1/+1
2021-08-05merge-strategies.txt: avoid giving special preference to patience algorithmElijah Newren1-5/+1
2021-08-05merge-strategies.txt: do not imply using copy detection is desiredElijah Newren1-3/+3
2021-08-05merge-strategies.txt: update wording for the resolve strategyElijah Newren1-7/+6
2021-08-05Documentation: edit awkward references to `git merge-recursive`Elijah Newren3-9/+9
2021-08-05directory-rename-detection.txt: small updates due to merge-ort optimizationsElijah Newren1-6/+8
2021-08-05git-rebase.txt: correct antiquated claims about --rebase-mergesElijah Newren1-6/+10
2021-08-05l10n: pt_PT: update git-po-helperDaniel Santos1-1947/+2090
2021-08-05l10n: pt_PT: remove trailing commentsDaniel Santos1-974/+0
2021-08-05l10n: pt_PT: translation tablesDaniel Santos1-82/+109
2021-08-05l10n: id: po-id for 2.33.0 (round 1)Bagas Sanjaya1-2250/+2434
2021-08-05l10n: tr: v2.33.0 round 1Emir Sarı1-1967/+2105
2021-08-04The eighth batchJunio C Hamano1-1/+16
2021-08-04fetch-pack: speed up loading of refs via commit graphPatrick Steinhardt1-2/+8
2021-08-04diff: --pickaxe-all typofixBagas Sanjaya1-1/+1
2021-08-04merge-ort: remove compile-time ability to turn off usage of memory poolsElijah Newren1-162/+47
2021-08-03l10n: fr.po v2.33 rnd 1Jean-Noël Avila1-2870/+4464
2021-08-03l10n: fr: fix typoJean-Noël Avila1-2/+2
2021-08-03l10n: pt_PT: add Portuguese translations part 5Daniel Santos1-4296/+5282
2021-08-03l10n: pt_PT: add Portuguese translations part 4Daniel Santos1-1073/+1011
2021-08-03l10n: Update Catalan translationJordi Mas1-48/+32
2021-08-03l10n: git.pot: v2.33.0 round 1 (38 new, 15 removed)Jiang Xin1-1933/+2046
2021-08-03mingw: align symlinks-related rmdir() behavior with LinuxThomas Bétous3-0/+37
2021-08-03t7508: avoid non POSIX BRECarlo Marcelo Arenas Belón1-1/+1
2021-08-02bundle doc: replace "basis" with "prerequsite(s)"Ævar Arnfjörð Bjarmason1-7/+7
2021-08-02bundle doc: elaborate on rev<->ref restrictionÆvar Arnfjörð Bjarmason1-8/+38
2021-08-02bundle doc: elaborate on object prerequisitesÆvar Arnfjörð Bjarmason1-3/+34
2021-08-02bundle doc: rewrite the "DESCRIPTION" sectionÆvar Arnfjörð Bjarmason1-15/+41
2021-08-02Git 2.33-rc0v2.33.0-rc0Junio C Hamano2-1/+18
2021-08-02t6001: avoid direct file system accessHan-Wen Nienhuys1-1/+2
2021-08-02t6500: use "ls -1" to snapshot ref database stateHan-Wen Nienhuys1-2/+3
2021-08-02t7064: use update-ref -d to remove upstream branchHan-Wen Nienhuys1-4/+1
2021-08-02t1410: mark test as REFFILESHan-Wen Nienhuys1-1/+3
2021-08-02t1405: mark test for 'git pack-refs' as REFFILESHan-Wen Nienhuys1-4/+10
2021-08-02t1405: use 'git reflog exists' to check reflog existenceHan-Wen Nienhuys1-2/+2
2021-08-02t2402: use ref-store test helper to create broken symlinkHan-Wen Nienhuys1-1/+1
2021-08-02t3320: use git-symbolic-ref rather than filesystem accessHan-Wen Nienhuys1-5/+7
2021-08-02t6120: use git-update-ref rather than filesystem accessHan-Wen Nienhuys1-2/+4
2021-08-02t1503: mark symlink test as REFFILESHan-Wen Nienhuys1-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 17:07:43 +0100