summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | * | ci: use the same version of p4 on both Linux and macOSJiang Xin2023-03-122-9/+10
| | | | | | | | | | | * | ci: remove the pipe after "p4 -V" to catch errorsJiang Xin2023-03-121-2/+2
| | | | | | | | | | | * | github-actions: run gcc-8 on ubuntu-20.04 imageJiang Xin2023-03-121-1/+1
| | | | | | | | | | | |/
| | | | | | | | | | * | Merge branch 'backport/jc/http-clear-finished-pointer' into maint-2.30Junio C Hamano2023-03-221-0/+26
| | | | | | | | | | |\ \
| | | | | | | | | | | * | http.c: clear the 'finished' member once we are done with itJunio C Hamano2023-03-221-0/+26
| | | | | | | | | | * | | Merge branch 'backport/js/ci-gcc-12-fixes'Junio C Hamano2023-03-223-1/+11
| | | | | | | | | | |\ \ \ | | | | | | | | | | | |/ / | | | | | | | | | | | | / | | | | | | | | | | | |/ | | | | | | | | | | |/|
| | | | | | | | | | | * clone.c: avoid "exceeds maximum object size" error with GCC v12.xJohannes Schindelin2023-03-221-0/+9
| | | | | | | | | | | * nedmalloc: avoid new compile errorJohannes Schindelin2023-03-121-1/+0
| | | | | | | | | | | * compat/win32/syslog: fix use-after-reallocJohannes Schindelin2023-03-121-0/+2
| | | | | | | | | | |/
| | | | | * | | | | | Makefile: force -O0 when compiling with SANITIZE=leakJeff King2023-03-231-0/+1
* | | | | | | | | | | Git 2.40v2.40.0Junio C Hamano2023-03-121-1/+1
* | | | | | | | | | | Merge tag 'l10n-2.40.0-rnd1' of https://github.com/git-l10n/git-poJunio C Hamano2023-03-128-4492/+3499
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-poJiang Xin2023-03-101-647/+471
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | l10n: zh_CN v2.40.0 round 1Fangyi Zhou2023-03-071-647/+471
| * | | | | | | | | | | | Merge branch 'l10n-de-2.40' of github.com:ralfth/gitJiang Xin2023-03-081-486/+681
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | l10n: update German translationRalf Thielow2023-03-061-486/+681
| * | | | | | | | | | | | | Merge branch 'po-id' of github.com:bagasme/git-poJiang Xin2023-03-081-739/+481
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | l10n: po-id for 2.40 (round 1)Bagas Sanjaya2023-03-021-739/+481
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'catalan' of github.com:Softcatala/git-poJiang Xin2023-03-081-475/+663
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | l10n: Update Catalan translationJordi Mas2023-03-011-475/+663
| * | | | | | | | | | | | | | Merge branch 'fr_2.40.0_rnd1' of github.com:jnavila/gitJiang Xin2023-03-081-706/+300
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | l10n: fr: v2.40.0 rnd 2Jean-Noël Avila2023-03-021-2/+6
| | * | | | | | | | | | | | | | l10n: fr: v2.40.0 rnd 1Jean-Noël Avila2023-03-021-704/+294
| | * | | | | | | | | | | | | | l10n: fr: fix some typosJean-Noël Avila2023-03-021-3/+3
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' of github.com:nafmo/git-l10n-svJiang Xin2023-03-081-471/+294
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | l10n: sv.po: Update Swedish translation (5490t0f0u)Peter Krefting2023-03-021-471/+294
| | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'master' of github.com:alshopov/git-poJiang Xin2023-03-081-494/+312
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | l10n: bg.po: Updated Bulgarian translation (5490t)Alexander Shopov2023-03-021-494/+312
| | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'turkish' of github.com:bitigchi/git-poJiang Xin2023-03-081-474/+297
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | l10n: tr: Update Turkish translations for v.2.40.0Emir SARI2023-03-031-474/+297
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Git 2.40-rc2v2.40.0-rc2Junio C Hamano2023-03-061-1/+1
* | | | | | | | | | | | | | Merge branch 'gm/signature-format-doc'Junio C Hamano2023-03-062-5/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | signature-format.txt: note SSH and X.509 signature delimitersGwyneth Morgan2023-02-272-5/+20
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rs/range-diff-custom-abbrev-fix'Junio C Hamano2023-03-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | range-diff: avoid compiler warning when char is unsignedRené Scharfe2023-02-281-1/+1
* | | | | | | | | | | | | Git 2.40-rc1v2.40.0-rc1Junio C Hamano2023-03-011-1/+1
* | | | | | | | | | | | | A bit more before 2.40-rc1Junio C Hamano2023-02-281-0/+9
* | | | | | | | | | | | | Merge branch 'ar/test-lib-remove-stale-comment'Junio C Hamano2023-02-281-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | test-lib: drop comment about test_descriptionAndrei Rybak2023-02-271-6/+0
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'zy/t9700-style'Junio C Hamano2023-02-281-31/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t9700: modernize test scriptsZhang Yi2023-02-251-31/+30
* | | | | | | | | | | | | | Merge branch 'pw/rebase-i-parse-fix'Junio C Hamano2023-02-285-18/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rebase -i: fix parsing of "fixup -C<commit>"Phillip Wood2023-02-234-6/+42
| * | | | | | | | | | | | | | rebase -i: match whole word in is_command()Phillip Wood2023-02-233-12/+14
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/http-test-fixes'Junio C Hamano2023-02-285-114/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | t5559: make SSL/TLS the defaultJeff King2023-02-231-0/+1
| * | | | | | | | | | | | | t5559: fix test failures with LIB_HTTPD_SSLJeff King2023-02-231-5/+18
| * | | | | | | | | | | | | t/lib-httpd: enable HTTP/2 "h2" protocol, not just h2cJeff King2023-02-231-1/+1
| * | | | | | | | | | | | | t/lib-httpd: respect $HTTPD_PROTO in expect_askpass()Jeff King2023-02-231-3/+3
| * | | | | | | | | | | | | t5551: drop curl trace lines without headersJeff King2023-02-231-1/+1