summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2021-08-16Git 2.33v2.33.0Junio C Hamano2-5/+1
2021-08-16Merge branch 'rs/oidtree-alignment-fix'Junio C Hamano3-7/+17
2021-08-16Merge tag 'l10n-2.33.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano17-35596/+37473
2021-08-16l10n: sv.po: Update Swedish translation (5230t0f0u)Peter Krefting1-508/+530
2021-08-16l10n: TEAMS: change Simplified Chinese team leaderJiang Xin1-3/+3
2021-08-15oidtree: avoid unaligned access to crit-bit treeRené Scharfe3-7/+17
2021-08-15Merge branch 'next' of github.com:ChrisADR/git-poJiang Xin1-4302/+3504
2021-08-15l10n: tr: v2.33 (round 2)Emir Sarı1-514/+538
2021-08-14l10n: es: 2.33.0 round 2Christopher Diaz Riveros1-4302/+3504
2021-08-15l10n: zh_CN: for git v2.33.0 l10n round 2Jiang Xin1-2202/+2345
2021-08-15l10n: zh_CN: Revision for git v2.32.0 l10n round 1Fangyi Zhou1-4/+4
2021-08-15l10n: README: refactor to use GFM syntaxJiang Xin1-172/+223
2021-08-15Merge branch 'l10n-2.33-rnd2' of github.com:ralfth/gitJiang Xin1-501/+522
2021-08-15Merge branch 'pt-PT' of github.com:git-l10n-pt-PT/git-poJiang Xin1-752/+679
2021-08-14l10n: update German translation for Git v2.33.0 (rnd2)Ralf Thielow1-501/+522
2021-08-14l10n: pt_PT: v2.33.0 round 2Daniel Santos1-26/+25
2021-08-14l10n: pt_PT: git-po-helper updateDaniel Santos1-741/+617
2021-08-14l10n: pt_PT: update translation tableDaniel Santos1-11/+63
2021-08-14Merge branch 'loc/zh_TW/210814' of github.com:l10n-tw/git-poJiang Xin1-2613/+2478
2021-08-14l10n: zh_TW.po: remove the obsolete glossaryYi-Jyun Pan1-275/+3
2021-08-14Merge branch 'master' of github.com:vnwildman/gitJiang Xin1-497/+517
2021-08-14Merge branch 'po-id' of github.com:bagasme/git-poJiang Xin1-531/+569
2021-08-14l10n: vi.po(5230t): Updated translation for v2.32.0 round 2Tran Ngoc Quan1-497/+517
2021-08-14l10n: fr.po v2.33 rnd 2Jean-Noël Avila1-507/+543
2021-08-14l10n: id: po-id for 2.33.0 round 2Bagas Sanjaya1-531/+569
2021-08-14l10n: zh_TW.po: update for v2.33.0 rnd 2Yi-Jyun Pan1-2341/+2478
2021-08-14Merge branch 'master' of github.com:vnwildman/gitJiang Xin1-15/+17
2021-08-14l10n: git.pot: v2.33.0 round 2 (11 new, 8 removed)Jiang Xin1-484/+504
2021-08-14Merge branch 'master' of github.com:git/gitJiang Xin50-419/+1248
2021-08-14Merge branch 'master' of github.com:nafmo/git-l10n-svJiang Xin1-1970/+2100
2021-08-14Merge branch 'master' of github.com:alshopov/git-poJiang Xin1-1953/+2075
2021-08-14Merge branch 'l10n-2.33' of github.com:ralfth/gitJiang Xin1-1976/+2097
2021-08-14Merge branch 'fr_fix_typos' of github.com:jnavila/gitJiang Xin1-104/+25
2021-08-14Merge branch 'master' of github.com:Softcatala/git-poJiang Xin1-101/+83
2021-08-13l10n: de.po: fix typosRalf Thielow1-19/+19
2021-08-13l10n: update German translation for Git v2.33.0Ralf Thielow1-1957/+2078
2021-08-12l10n: fr.po fix typos in commands and variablesJean-Noël Avila1-104/+25
2021-08-12l10n: id: mismatch variable name fixesBagas Sanjaya1-5/+5
2021-08-12l10n: vi.po(5227t): Fixed typo after run git-po-helperTran Ngoc Quan1-15/+17
2021-08-12l10n: Update Catalan translationJordi Mas1-101/+83
2021-08-12Merge branch 'daniel' of github.com:git-l10n-pt-PT/git-poJiang Xin1-6741/+6852
2021-08-11Git 2.33-rc2v2.33.0-rc2Junio C Hamano2-13/+1
2021-08-11Merge branch 'jn/log-m-does-not-imply-p'Junio C Hamano3-7/+6
2021-08-11Merge branch 'cb/many-alternate-optim-fixup'Junio C Hamano3-10/+5
2021-08-11object-file: use unsigned arithmetic with bit maskRené Scharfe1-1/+1
2021-08-11l10n: pt_PT: cleaning flags mismatchDaniel Santos1-6/+6
2021-08-10l10n: pt_PT: cleaning duplicate translationsDaniel Santos1-426/+426
2021-08-10l10n: pt_PT: update translation tablesDaniel Santos1-12/+14
2021-08-10l10n: pt_PT: translated git v2.33.0Daniel Santos1-49/+38
2021-08-09Revert 'diff-merges: let "-m" imply "-p"'Jonathan Nieder3-7/+6
2021-08-09l10n: sv.po: Update Swedish translation (5227t0f0u)Peter Krefting1-1970/+2100
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-06Merge branch 'cb/t7508-regexp-fix'Junio C Hamano1-1/+1
2021-08-06Merge branch 'ab/pickaxe-pcre2'Junio C Hamano1-1/+1
2021-08-06Merge branch 'fc/disable-checkwinsize'Junio C Hamano1-0/+6
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-06Merge branch 'po-id' of github.com:bagasme/git-poJiang Xin1-2250/+2434
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-05Merge branch 'tr-loc-v2.33' of github.com:bitigchi/git-poJiang Xin1-1967/+2105
2021-08-05l10n: tr: v2.33.0 round 1Emir Sarı1-1967/+2105
2021-08-05Merge branch 'fr_v2.33_rnd1' of github.com:jnavila/gitJiang Xin1-2872/+4466
2021-08-04The eighth batchJunio C Hamano1-1/+16
2021-08-04Merge branch 'tb/mingw-rmdir-symlink-to-directory'Junio C Hamano3-0/+37
2021-08-04Merge branch 'ar/doc-markup-fix'Junio C Hamano2-2/+2
2021-08-04Merge branch 'ab/getcwd-test'Junio C Hamano5-1/+33
2021-08-04Merge branch 'rs/use-fspathhash'Junio C Hamano3-26/+8
2021-08-04Merge branch 'pb/merge-autostash-more'Junio C Hamano3-2/+24
2021-08-04Merge branch 'en/ort-perf-batch-14'Junio C Hamano2-12/+389
2021-08-04Merge branch 'ds/commit-and-checkout-with-sparse-index'Junio C Hamano7-30/+240
2021-08-04Merge branch 'ab/update-submitting-patches'Junio C Hamano1-111/+96
2021-08-04Merge branch 'ah/plugleaks'Junio C Hamano12-27/+42
2021-08-04Merge branch 'ar/submodule-add'Junio C Hamano4-175/+341
2021-08-04diff: --pickaxe-all typofixBagas Sanjaya1-1/+1
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-03Merge branch 'master' of github.com:git/gitJiang Xin394-9973/+9347
2021-08-02mingw: align symlinks-related rmdir() behavior with LinuxThomas Bétous3-0/+37
2021-08-02t7508: avoid non POSIX BRECarlo Marcelo Arenas Belón1-1/+1
2021-08-02Git 2.33-rc0v2.33.0-rc0Junio C Hamano2-1/+18
2021-08-02Merge branch 'jk/check-pack-valid-before-opening-bitmap'Junio C Hamano1-0/+5
2021-08-02Merge branch 'jt/bulk-prefetch'Junio C Hamano5-21/+82
2021-08-02Merge branch 'fc/pull-no-rebase-merges-theirs-into-ours'Junio C Hamano1-1/+1
2021-08-02Merge branch 'ab/bundle-tests'Junio C Hamano1-16/+56
2021-08-02Merge branch 'ps/perf-with-separate-output-directory'Junio C Hamano3-13/+24
2021-08-02Merge branch 'js/ci-check-whitespace-updates'Junio C Hamano1-24/+2
2021-08-02Merge branch 'jk/config-env-doc'Junio C Hamano1-11/+17
2021-08-02Merge branch 'pb/submodule-recurse-doc'Junio C Hamano1-2/+3
2021-08-02Merge branch 'tb/bitmap-type-filter-comment-fix'Junio C Hamano1-5/+6
2021-07-30use fspathhash() everywhereRené Scharfe3-26/+8
2021-07-30t0001: fix broken not-quite getcwd(3) test in bed67874e2Ævar Arnfjörð Bjarmason5-1/+33
2021-07-30Documentation: render special characters correctlyAndrei Rybak2-2/+2
2021-07-28The seventh batchJunio C Hamano1-0/+43
2021-07-28Merge branch 'ps/t0000-output-directory-fix'Junio C Hamano2-2/+14
2021-07-28Merge branch 'tb/reverse-midx'Junio C Hamano2-1/+6
2021-07-28Merge branch 'hn/refs-debug-empty-prefix'Junio C Hamano1-1/+2
2021-07-28Merge branch 'pb/dont-complete-aliased-options'Junio C Hamano2-1/+14
2021-07-28Merge branch 'en/rename-limits-doc'Junio C Hamano7-17/+26
2021-07-28Merge branch 'ds/gender-neutral-doc-guidelines'Junio C Hamano1-0/+45
2021-07-28Merge branch 'ds/status-with-sparse-index'Junio C Hamano10-38/+470
2021-07-28Merge branch 'js/ci-make-sparse'Junio C Hamano2-0/+25
2021-07-28Merge branch 'ab/pkt-line-tests'Junio C Hamano5-34/+24
2021-07-28Merge branch 'jk/t0000-subtests-fix'Junio C Hamano1-10/+29
2021-07-28Merge branch 'dl/diff-merge-base'Junio C Hamano2-5/+9
2021-07-28Merge branch 'ab/attribute-format'Junio C Hamano23-29/+47
2021-07-28Merge branch 'jk/log-decorate-optim'Junio C Hamano8-32/+77
2021-07-28Merge branch 'sm/worktree-add-lock'Junio C Hamano3-8/+33
2021-07-28Merge branch 'ew/many-alternate-optim'Junio C Hamano16-51/+534
2021-07-28Merge branch 'hj/commit-allow-empty-message'Junio C Hamano2-12/+19
2021-07-28Merge branch 'dl/packet-read-response-end-fix'Junio C Hamano3-3/+3
2021-07-26ci/install-dependencies: handle "sparse" job package installsJeff King2-4/+7
2021-07-26ci: run "apt-get update" before "apt-get install"Jeff King1-0/+1
2021-07-26reset: clear_unpack_trees_porcelain to plug leakAndrzej Hunt1-2/+2
2021-07-26builtin/rebase: fix options.strategy memory lifecycleAndrzej Hunt1-1/+2
2021-07-26builtin/merge: free found_ref when doneAndrzej Hunt1-1/+2
2021-07-26builtin/mv: free or UNLEAK multiple pointers at end of cmd_mvAndrzej Hunt1-0/+5
2021-07-26convert: release strbuf to avoid leakAndrzej Hunt1-0/+2
2021-07-26read-cache: call diff_setup_done to avoid leakAndrzej Hunt1-0/+1
2021-07-26ref-filter: also free head for ATOM_HEAD to avoid leakAndrzej Hunt1-2/+6
2021-07-26diffcore-rename: move old_dir/new_dir definition to plug leakAndrzej Hunt1-3/+7
2021-07-26builtin/for-each-repo: remove unnecessary argv copy to plug leakAndrzej Hunt1-10/+4
2021-07-26builtin/submodule--helper: release unused strbuf to avoid leakAndrzej Hunt1-2/+4
2021-07-26environment: move strbuf into block to plug leakAndrzej Hunt1-4/+3
2021-07-26fmt-merge-msg: free newly allocated temporary strings when doneAndrzej Hunt1-2/+4
2021-07-26submodule: drop unused sm_name parameter from show_fetch_remotes()Jeff King1-3/+2
2021-07-23merge: apply autostash if merge strategy failsPhilippe Blain2-0/+9
2021-07-23merge: apply autostash if fast-forward failsPhilippe Blain2-0/+12
2021-07-23Documentation: define 'MERGE_AUTOSTASH'Philippe Blain1-1/+2
2021-07-23merge: add missing word "strategy" to a messagePhilippe Blain1-1/+1
2021-07-23cache-tree: prefetch in partial clone read-treeJonathan Tan2-2/+42
2021-07-23unpack-trees: refactor prefetching codeJonathan Tan3-19/+40
2021-07-23pack-bitmap: check pack validity when opening bitmapJeff King1-0/+5
2021-07-22bundle tests: use test_cmp instead of grepÆvar Arnfjörð Bjarmason1-13/+53
2021-07-22bundle tests: use ">file" not ": >file"Ævar Arnfjörð Bjarmason1-3/+3
2021-07-22The sixth batchJunio C Hamano1-0/+10
2021-07-22Merge branch 'bc/rev-list-without-commit-line'Junio C Hamano4-12/+112
2021-07-22Merge branch 'ab/imap-send-read-everything-simplify'Junio C Hamano1-14/+2
2021-07-22Merge branch 'ab/gitignore-discovery-doc'Junio C Hamano1-6/+5
2021-07-22Merge branch 'js/ci-windows-update'Junio C Hamano2-112/+50
2021-07-22Merge branch 'ab/send-email-optim'Junio C Hamano4-79/+159
2021-07-22Merge branch 'jk/typofix'Junio C Hamano1-1/+1
2021-07-22SubmittingPatches: replace discussion of Travis with GitHub ActionsÆvar Arnfjörð Bjarmason1-32/+17
2021-07-22SubmittingPatches: move discussion of Signed-off-by above "send"Ævar Arnfjörð Bjarmason1-79/+79
2021-07-21doc: pull: fix rebase=false documentationFelipe Contreras1-1/+1
2021-07-20pack-bitmap: clarify comment in filter_bitmap_exclude_type()Taylor Blau1-5/+6
2021-07-20unpack-trees: resolve sparse-directory/file conflictsDerrick Stolee2-12/+23
2021-07-20t1092: document bad 'git checkout' behaviorDerrick Stolee1-2/+140
2021-07-20doc: clarify description of 'submodule.recurse'Philippe Blain1-2/+3
2021-07-20doc/git-config: simplify "override" advice for FILES sectionJeff King1-5/+4
2021-07-20doc/git-config: clarify GIT_CONFIG environment variableJeff King1-5/+6
2021-07-20doc/git-config: explain --file instead of referring to GIT_CONFIGJeff King1-1/+7
2021-07-20merge-ort: restart merge with cached renames to reduce process entry costElijah Newren2-7/+87
2021-07-20merge-ort: avoid recursing into directories when we don't need toElijah Newren1-3/+99
2021-07-20merge-ort: defer recursing into directories when merge base is matchedElijah Newren1-2/+31
2021-07-20merge-ort: add a handle_deferred_entries() helper functionElijah Newren1-0/+64
2021-07-20merge-ort: add data structures for allowable trivial directory resolvesElijah Newren1-0/+61
2021-07-20merge-ort: add some more explanations in collect_merge_info_callback()Elijah Newren1-5/+15
2021-07-20merge-ort: resolve paths early when we have sufficient informationElijah Newren1-0/+37
2021-07-20t0000: fix test if run with TEST_OUTPUT_DIRECTORYPatrick Steinhardt2-2/+14
2021-07-19multi-pack-index: fix potential segfault without sub-commandTaylor Blau2-1/+6
2021-07-19refs/debug: quote prefixHan-Wen Nienhuys1-1/+2
2021-07-19t0000: clear GIT_SKIP_TESTS before running sub-testsJeff King1-10/+29
2021-07-19test-lib-functions: use test-tool for [de]packetize()Ævar Arnfjörð Bjarmason5-34/+24
2021-07-16The fifth batchJunio C Hamano1-0/+29
2021-07-16Merge branch 'ds/gender-neutral-doc'Junio C Hamano11-16/+14
2021-07-16Merge branch 'jt/partial-clone-submodule-1'Junio C Hamano14-82/+196
2021-07-16Merge branch 'ab/struct-init'Junio C Hamano29-64/+76
2021-07-16Merge branch 'dd/test-stdout-count-lines'Junio C Hamano3-76/+98
2021-07-16Merge branch 'hn/refs-test-cleanup'Junio C Hamano2-8/+6
2021-07-16Merge branch 'rs/khash-alloc-cleanup'Junio C Hamano1-9/+5
2021-07-16Merge branch 'ar/help-micro-cleanup'Junio C Hamano1-9/+8
2021-07-16Merge branch 'ar/submodule-helper-include-cleanup'Junio C Hamano1-1/+0
2021-07-16Merge branch 'ab/bundle-updates'Junio C Hamano4-65/+104
2021-07-16Merge branch 'hn/refs-iterator-peel-returns-boolean'Junio C Hamano4-3/+6
2021-07-16Merge branch 'ab/mktag-tests'Junio C Hamano1-15/+106
2021-07-16Merge branch 'ab/show-branch-tests'Junio C Hamano3-73/+155
2021-07-16Merge branch 'ab/fetch-negotiate-segv-fix'Junio C Hamano5-8/+38
2021-07-16Merge branch 'ab/make-delete-on-error'Junio C Hamano1-11/+18
2021-07-16Merge branch 'ew/mmap-failures'Junio C Hamano5-5/+22
2021-07-16Merge branch 'js/config-mak-windows-pcre-fix'Junio C Hamano1-1/+1
2021-07-16Merge branch 'js/gfw-system-config-loc-fix'Junio C Hamano3-7/+21
2021-07-16Merge branch 'ks/submodule-cleanup'Junio C Hamano1-7/+7
2021-07-16Merge branch 'tb/midx-use-checksum'Junio C Hamano6-18/+52
2021-07-16Merge branch 'en/merge-dir-rename-corner-case-fix'Junio C Hamano3-7/+193
2021-07-16Merge branch 'en/ort-perf-batch-13'Junio C Hamano4-34/+612
2021-07-16Merge branch 'en/ort-perf-batch-12'Junio C Hamano3-26/+60
2021-07-16CodingGuidelines: recommend gender-neutral descriptionJunio C Hamano1-0/+45
2021-07-16parse-options: don't complete option aliases by defaultPhilippe Blain2-1/+14
2021-07-15rename: bump limit defaults yet againElijah Newren5-5/+5
2021-07-15diffcore-rename: treat a rename_limit of 0 as unlimitedElijah Newren2-1/+2