summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* branch: new autosetupmerge option 'simple' for matching branchesTao Klerks2022-04-297-14/+94
* Some regression fixes for 2.36Junio C Hamano2022-04-283-2/+21
* Merge branch 'rs/name-rev-fix-free-after-use'Junio C Hamano2022-04-281-16/+5
|\
| * Revert "name-rev: release unused name strings"René Scharfe2022-04-231-16/+5
* | Merge branch 'jc/diff-tree-stdin-fix'Junio C Hamano2022-04-283-0/+18
|\ \
| * | 2.36 gitk/diff-tree --stdin regression fixJunio C Hamano2022-04-263-0/+18
* | | Merge branch 'gc/submodule-update-part2'Junio C Hamano2022-04-282-1/+33
|\ \ \
| * | | submodule--helper: fix initialization of warn_if_uninitializedOrgad Shaneh2022-04-262-1/+33
* | | | Git 2.36v2.36.0Junio C Hamano2022-04-181-1/+1
* | | | Merge tag 'l10n-2.36.0-rnd2.1' of https://github.com/git-l10n/git-poJunio C Hamano2022-04-1812-47530/+54917
|\ \ \ \
| * | | | l10n: sv.po: Update Swedish translation (5282t0f0u)Peter Krefting2022-04-171-3959/+4735
| * | | | Merge branch 'master' of github.com:Softcatala/git-poJiang Xin2022-04-171-4044/+4892
| |\ \ \ \
| | * | | | l10n: Update Catalan translationJordi Mas2022-04-161-4044/+4892
| * | | | | l10n: po-id for 2.36 (round 2)Bagas Sanjaya2022-04-161-287/+121
| * | | | | Merge branch 'master' of github.com:ruester/git-po-deJiang Xin2022-04-151-4024/+4576
| |\ \ \ \ \
| | * | | | | l10n: de.po: Update German translationMatthias Rüster2022-04-141-4024/+4576
| * | | | | | Merge branch 'fz/po-2.36.0-round2' of github.com:fangyi-zhou/git-poJiang Xin2022-04-151-307/+65
| |\ \ \ \ \ \
| | * | | | | | l10n: zh_CN v2.36.0 round 2Fangyi Zhou2022-04-141-307/+65
| | |/ / / / /
| * / / / / / l10n: pt_PT: update Portuguese translationDaniel Santos2022-04-141-6428/+7063
| |/ / / / /
| * | | | | l10n: vi(5285t): v2.36.0 round 2Tran Ngoc Quan2022-04-141-3937/+4752
| * | | | | Merge branch 'loc/tw/0407' of github.com:l10n-tw/git-poJiang Xin2022-04-141-3973/+4749
| |\ \ \ \ \
| | * | | | | l10n: zh_TW: v2.36.0 round 2Yi-Jyun Pan2022-04-141-3973/+4749
| * | | | | | l10n: fr: v2.36 round 2Jean-Noël Avila2022-04-131-89/+165
| |/ / / / /
| * | | | | l10n: tr: v2.36.0 round 2Emir SARI2022-04-131-62/+84
| * | | | | l10n: git.pot: v2.36.0 round 2 (4 new, 3 removed)Jiang Xin2022-04-131-40/+52
| * | | | | Merge branch 'master' of github.com:git/gitJiang Xin2022-04-1331-48/+331
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fr_2.36_rnd1' of github.com:jnavila/gitJiang Xin2022-04-111-3969/+4717
| |\ \ \ \ \ \
| | * | | | | | l10n: fr: v2.36 round 1Jean-Noël Avila2022-04-091-3969/+4717
| * | | | | | | Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-poJiang Xin2022-04-112-3937/+4706
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: zh_CN v2.36.0 round 1Fangyi Zhou2022-04-081-3935/+4704
| | * | | | | | | l10n: Update zh_CN repo linkFangyi Zhou2022-04-082-2/+2
| | |/ / / / / /
| * / / / / / / l10n: po-id for 2.36 (round 1)Bagas Sanjaya2022-04-071-4206/+5075
| |/ / / / / /
| * | / / / / l10n: tr: v2.36.0 round 1Emir SARI2022-04-061-3958/+4479
| | |/ / / / | |/| | | |
| * | | | | l10n: git.pot: v2.36.0 round 1 (192 new, 106 removed)Jiang Xin2022-04-061-3828/+4320
| * | | | | Merge branch 'master' of github.com:git-l10n/git-poJiang Xin2022-04-062-4268/+4152
| |\ \ \ \ \
| | * | | | | l10n: pt_PT: update TEAMS fileDaniel Santos2022-02-051-2/+2
| | * | | | | l10n: pt_PT: update Portuguese translationDaniel Santos2022-02-051-4266/+4150
* | | | | | | Merge branch 'cb/buggy-gcc-12-workaround'Junio C Hamano2022-04-181-0/+6
|\ \ \ \ \ \ \
| * | | | | | | config.mak.dev: alternative workaround to gcc 12 warning in http.cCarlo Marcelo Arenas Belón2022-04-161-0/+1
| * | | | | | | config.mak.dev: workaround gcc 12 bug affecting "pedantic" CI jobCarlo Marcelo Arenas Belón2022-04-161-0/+5
* | | | | | | | Merge branch 'jc/revert-ref-transaction-hook-changes'Junio C Hamano2022-04-1411-217/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | RelNotes: revert the description on the reverted topicsJunio C Hamano2022-04-141-10/+0
| * | | | | | | | Revert "fetch: increase test coverage of fetches"Junio C Hamano2022-04-142-93/+0
| * | | | | | | | Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'"Junio C Hamano2022-04-148-114/+19
* | | | | | | | | Merge branch 'jc/relnotes-updates'Junio C Hamano2022-04-141-6/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | RelNotes: mention safe.directoryJunio C Hamano2022-04-141-2/+9
| * | | | | | | | RelNotes: clarify "bisect run unexecutable" tweakJunio C Hamano2022-04-141-4/+4
|/ / / / / / / /
* | | | / / / / Sync with Git 2.35.3Junio C Hamano2022-04-149-3/+106
|\| | | | | | | | |_|_|/ / / / |/| | | | | |
| * | | | | | Git 2.35.3v2.35.3Junio C Hamano2022-04-1411-5/+108
| |\ \ \ \ \ \
| | * \ \ \ \ \ Git 2.34.3v2.34.3Junio C Hamano2022-04-1410-5/+104
| | |\ \ \ \ \ \