summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-08-11Git 2.33-rc2Libravatar Junio C Hamano2-13/+1
2021-08-11Merge branch 'jn/log-m-does-not-imply-p'Libravatar Junio C Hamano3-7/+6
2021-08-11Merge branch 'cb/many-alternate-optim-fixup'Libravatar Junio C Hamano3-10/+5
2021-08-11userdiff: improve java hunk header regexLibravatar Tassilo Horn6-1/+39
2021-08-11userdiff: comment on the builtin patternsLibravatar Junio C Hamano1-0/+10
2021-08-11object-file: use unsigned arithmetic with bit maskLibravatar René Scharfe1-1/+1
2021-08-11l10n: pt_PT: cleaning flags mismatchLibravatar Daniel Santos1-6/+6
2021-08-10connect, protocol: log negotiated protocol versionLibravatar Josh Steadmon3-0/+15
2021-08-10apply: keep buffer/size pair in sync when parsing binary hunksLibravatar Jeff King2-0/+24
2021-08-10range-diff: use ssize_t for parsed "len" in read_patches()Libravatar Jeff King1-1/+1
2021-08-10range-diff: handle unterminated lines in read_patches()Libravatar Jeff King1-14/+11
2021-08-10range-diff: drop useless "offset" variable from read_patches()Libravatar Jeff King1-2/+2
2021-08-10l10n: pt_PT: cleaning duplicate translationsLibravatar Daniel Santos1-426/+426
2021-08-10l10n: pt_PT: update translation tablesLibravatar Daniel Santos1-12/+14
2021-08-10l10n: pt_PT: translated git v2.33.0Libravatar Daniel Santos1-49/+38
2021-08-09Revert 'diff-merges: let "-m" imply "-p"'Libravatar Jonathan Nieder3-7/+6
2021-08-09l10n: sv.po: Update Swedish translation (5227t0f0u)Libravatar Peter Krefting1-1970/+2100
2021-08-09revision: avoid hitting packfiles when commits are in commit-graphLibravatar Patrick Steinhardt3-10/+40
2021-08-09commit-graph: split out function to search commit positionLibravatar Patrick Steinhardt1-25/+30
2021-08-09revision: stop retrieving reference twiceLibravatar Patrick Steinhardt1-1/+1
2021-08-09connected: do not sort input revisionsLibravatar Patrick Steinhardt4-1/+48
2021-08-09builtin/merge: avoid -Wformat-extra-args from ancient XcodeLibravatar Carlo Marcelo Arenas Belón1-3/+5
2021-08-09object-store: avoid extra ';' from KHASH_INITLibravatar Carlo Marcelo Arenas Belón1-1/+1
2021-08-09oidtree: avoid nested struct oidtree_nodeLibravatar Carlo Marcelo Arenas Belón1-8/+3
2021-08-09l10n: vi.po(5227t): Updated Vietnamese translation for v2.32.0Libravatar Tran Ngoc Quan1-1963/+2089
2021-08-06Git 2.33-rc1Libravatar Junio C Hamano1-1/+1
2021-08-06Merge branch 'cb/t7508-regexp-fix'Libravatar Junio C Hamano1-1/+1
2021-08-06Merge branch 'ab/pickaxe-pcre2'Libravatar Junio C Hamano1-1/+1
2021-08-06Merge branch 'fc/disable-checkwinsize'Libravatar Junio C Hamano1-0/+6
2021-08-06test: fix for COLUMNS and bash 5Libravatar Felipe Contreras1-0/+6
2021-08-06l10n: bg.po: Updated Bulgarian translation (5227t)Libravatar Alexander Shopov1-1953/+2075
2021-08-06Merge branch 'po-id' of github.com:bagasme/git-poLibravatar Jiang Xin1-2250/+2434
2021-08-05Update docs for change of default merge backendLibravatar Elijah Newren5-60/+67
2021-08-05Change default merge backend from recursive to ortLibravatar Elijah Newren3-5/+11
2021-08-05revision: separate walk and unsorted flagsLibravatar Patrick Steinhardt4-11/+10
2021-08-05Update error message and code commentLibravatar Elijah Newren2-2/+2
2021-08-05merge-strategies.txt: add coverage of the `ort` merge strategyLibravatar Elijah Newren1-0/+14
2021-08-05git-rebase.txt: correct out-of-date and misleading text about renamesLibravatar Elijah Newren1-3/+1
2021-08-05merge-strategies.txt: fix simple capitalization errorLibravatar Elijah Newren1-1/+1
2021-08-05merge-strategies.txt: avoid giving special preference to patience algorithmLibravatar Elijah Newren1-5/+1
2021-08-05merge-strategies.txt: do not imply using copy detection is desiredLibravatar Elijah Newren1-3/+3
2021-08-05merge-strategies.txt: update wording for the resolve strategyLibravatar Elijah Newren1-7/+6
2021-08-05Documentation: edit awkward references to `git merge-recursive`Libravatar Elijah Newren3-9/+9
2021-08-05directory-rename-detection.txt: small updates due to merge-ort optimizationsLibravatar Elijah Newren1-6/+8
2021-08-05git-rebase.txt: correct antiquated claims about --rebase-mergesLibravatar Elijah Newren1-6/+10
2021-08-05l10n: pt_PT: update git-po-helperLibravatar Daniel Santos1-1947/+2090
2021-08-05l10n: pt_PT: remove trailing commentsLibravatar Daniel Santos1-974/+0
2021-08-05l10n: pt_PT: translation tablesLibravatar Daniel Santos1-82/+109
2021-08-05l10n: id: po-id for 2.33.0 (round 1)Libravatar Bagas Sanjaya1-2250/+2434
2021-08-05Merge branch 'tr-loc-v2.33' of github.com:bitigchi/git-poLibravatar Jiang Xin1-1967/+2105