summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* convert: add [async_]convert_to_working_tree_ca() variantsJeff Hostetler2021-03-182-37/+60
* convert: make convert_attrs() and convert structs publicJeff Hostetler2021-03-182-27/+32
* Git 2.31v2.31.0Junio C Hamano2021-03-151-1/+1
* Merge branch 'jn/mergetool-hideresolved-is-optional'Junio C Hamano2021-03-153-8/+7
|\
| * doc: describe mergetool configuration in git-mergetool(1)Jonathan Nieder2021-03-141-0/+4
| * mergetool: do not enable hideResolved by defaultJonathan Nieder2021-03-142-8/+3
* | Merge branch 'tb/pack-revindex-on-disk'Junio C Hamano2021-03-151-1/+2
|\ \
| * | pack-revindex.c: don't close unopened file descriptorsTaylor Blau2021-02-261-1/+2
* | | Merge tag 'l10n-2.31.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2021-03-1416-43702/+75702
|\ \ \
| * | | l10n: zh_CN: for git v2.31.0 l10n round 1 and 2Jiang Xin2021-03-141-2985/+3337
| * | | Merge branch 'master' of github.com:vnwildman/gitJiang Xin2021-03-141-3051/+3508
| |\ \ \
| | * | | l10n: vi.po(5104t): for git v2.31.0 l10n round 2Tran Ngoc Quan2021-03-081-3051/+3508
| * | | | Merge branch 'l10n/zh_TW/210301' of github.com:l10n-tw/git-poJiang Xin2021-03-141-3072/+3535
| |\ \ \ \
| | * | | | l10n: zh_TW.po: v2.31.0 round 2 (15 untranslated)Yi-Jyun Pan2021-03-051-3072/+3535
| * | | | | Merge branch 'po-id' of github.com:bagasme/git-poJiang Xin2021-03-142-0/+24362
| |\ \ \ \ \
| | * | | | | l10n: Add translation team infoBagas Sanjaya2021-03-071-0/+4
| | * | | | | l10n: start Indonesian translationBagas Sanjaya2021-03-071-0/+24358
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'master' of github.com:Softcatala/git-poJiang Xin2021-03-141-13/+12
| |\ \ \ \ \
| | * | | | | l10n: Update Catalan translationJordi Mas2021-02-241-13/+12
| * | | | | | Merge branch 'russian-l10n' of github.com:DJm00n/git-po-ruJiang Xin2021-03-141-5661/+7873
| |\ \ \ \ \ \
| | * | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2021-01-291-5661/+7873
| | |/ / / / /
| * | | | | | Merge branch 'pt-PT' of github.com:git-l10n-pt-PT/git-poJiang Xin2021-03-141-2902/+3226
| |\ \ \ \ \ \
| | * | | | | | l10n: pt_PT: add Portuguese translations part 1Daniel Santos2021-03-081-2902/+3226
| * | | | | | | l10n: de.po: Update German translation for Git v2.31.0Matthias Rüster2021-03-081-3208/+3565
| |/ / / / / /
| * | / / / / l10n: es: 2.31.0 round 2Christopher Diaz Riveros2021-03-081-4822/+5924
| | |/ / / / | |/| | | |
| * | | | | l10n: bg.po: Updated Bulgarian translation (5104t)Alexander Shopov2021-03-051-3060/+3440
| * | | | | Merge branch 'fr_next' of github.com:jnavila/gitJiang Xin2021-03-051-332/+411
| |\ \ \ \ \
| | * | | | | l10n: fr: v2.31 rnd 2Jean-Noël Avila2021-03-041-332/+411
| * | | | | | Merge branch 'master' of github.com:nafmo/git-l10n-svJiang Xin2021-03-051-297/+324
| |\ \ \ \ \ \
| | * | | | | | l10n: sv.po: Update Swedish translation (5104t0f0u)Peter Krefting2021-03-041-297/+324
| | |/ / / / /
| * / / / / / l10n: tr: v2.31.0-rc1Emir Sarı2021-03-041-309/+317
| |/ / / / /
| * | | | | l10n: git.pot: v2.31.0 round 2 (9 new, 8 removed)Jiang Xin2021-03-041-292/+298
| * | | | | Merge branch 'master' of github.com:git/gitJiang Xin2021-03-0448-924/+1948
| |\ \ \ \ \
| * | | | | | l10n: tr: v2.31.0-rc0Emir Sarı2021-03-021-2889/+3252
| | |_|/ / / | |/| | | |
| * | | | | Merge branch 'master' of github.com:nafmo/git-l10n-svJiang Xin2021-03-011-2926/+3348
| |\ \ \ \ \
| | * | | | | l10n: sv.po: Update Swedish translation (5103t0f0u)Peter Krefting2021-02-281-2926/+3348
| * | | | | | Merge branch 'pl' of github.com:Arusekk/git-poJiang Xin2021-03-011-2932/+3366
| |\ \ \ \ \ \
| | * | | | | | l10n: pl.po: Update translationArusekk2021-02-271-2932/+3366
| | |/ / / / /
| * / / / / / l10n: fr: v2.31.0 rnd 1Jean-Noël Avila2021-02-271-2945/+3261
| |/ / / / /
| * | | | | l10n: git.pot: v2.31.0 round 1 (155 new, 89 removed)Jiang Xin2021-02-261-2777/+3114
* | | | | | Git 2.31-rc2v2.31.0-rc2Junio C Hamano2021-03-092-1/+3
* | | | | | Sync with Git 2.30.2 for CVE-2021-21300Junio C Hamano2021-03-0923-4/+292
|\ \ \ \ \ \
| * | | | | | Git 2.30.2v2.30.2Johannes Schindelin2021-02-123-2/+10
| * | | | | | Sync with 2.29.3Johannes Schindelin2021-02-1222-4/+284
| |\ \ \ \ \ \
| | * | | | | | Git 2.29.3v2.29.3Johannes Schindelin2021-02-123-2/+10
| | * | | | | | Sync with 2.28.1Johannes Schindelin2021-02-1221-4/+277
| | |\ \ \ \ \ \
| | | * | | | | | Git 2.28.1v2.28.1Johannes Schindelin2021-02-123-2/+9
| | | * | | | | | Sync with 2.27.1Johannes Schindelin2021-02-1220-4/+270
| | | |\ \ \ \ \ \
| | | | * | | | | | Git 2.27.1v2.27.1Johannes Schindelin2021-02-123-2/+9
| | | | * | | | | | Sync with 2.26.3Johannes Schindelin2021-02-1219-4/+263
| | | | |\ \ \ \ \ \