summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 2.31.1v2.31.1Junio C Hamano2021-03-263-2/+29
* Merge branch 'tb/git-mv-icase-fix'Junio C Hamano2021-03-191-1/+1
|\
| * git mv foo FOO ; git mv foo bar gave an assertTorsten Bögershausen2021-03-031-1/+1
* | Merge branch 'rs/xcalloc-takes-nelem-first'Junio C Hamano2021-03-194-6/+17
|\ \
| * | fix xcalloc() argument orderRené Scharfe2021-03-086-17/+28
* | | Merge branch 'ah/make-fuzz-all-doc-update'Junio C Hamano2021-03-191-3/+3
|\ \ \
| * | | Makefile: update 'make fuzz-all' docs to reflect modern clangAndrzej Hunt2021-03-081-3/+3
* | | | Merge branch 'jk/slimmed-down'Junio C Hamano2021-03-195-102/+0
|\ \ \ \
| * | | | vcs-svn: remove header files as wellRené Scharfe2021-03-145-102/+0
* | | | | Merge branch 'rs/calloc-array'Junio C Hamano2021-03-1989-189/+191
|\ \ \ \ \
| * | | | | cocci: allow xcalloc(1, size)Junio C Hamano2021-03-151-1/+1
| * | | | | use CALLOC_ARRAYRené Scharfe2021-03-1388-188/+190
| * | | | | git-compat-util.h: drop trailing semicolon from macro definitionRené Scharfe2021-03-131-1/+1
* | | | | | Merge branch 'rs/avoid-null-statement-after-macro-call'Junio C Hamano2021-03-192-2/+2
|\ \ \ \ \ \
| * | | | | | mem-pool: drop trailing semicolon from macro definitionRené Scharfe2021-03-171-1/+1
| * | | | | | block-sha1: drop trailing semicolon from macro definitionRené Scharfe2021-03-171-1/+1
* | | | | | | Merge branch 'km/config-doc-typofix'Junio C Hamano2021-03-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | config.txt: add missing periodKyle Meyer2021-03-171-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'jt/clone-unborn-head'Junio C Hamano2021-03-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t5606: run clone branch name test with protocol v2Jonathan Tan2021-03-171-1/+1
* | | | | | | | Merge branch 'js/fsmonitor-unpack-fix'Junio C Hamano2021-03-192-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | fsmonitor: do not forget to release the token in `discard_index()`Johannes Schindelin2021-03-171-0/+1
| * | | | | | | | fsmonitor: fix memory corruption in some corner casesJohannes Schindelin2021-03-171-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/bisect-peel-tag-fix'Junio C Hamano2021-03-192-1/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | bisect: peel annotated tags to commitsJeff King2021-03-172-1/+20
| |/ / / / / / /
* | | | | | | | Merge branch 'jh/fsmonitor-prework'Junio C Hamano2021-03-191-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | fsmonitor: avoid global-buffer-overflow READ when checking trivial responseAndrzej Hunt2021-03-171-3/+3
* | | | | | | | | Merge branch 'jc/calloc-fix'Junio C Hamano2021-03-192-6/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | xcalloc: use CALLOC_ARRAY() when applicableJunio C Hamano2021-03-152-6/+4
* | | | | | | | | | Git 2.31v2.31.0Junio C Hamano2021-03-151-1/+1
* | | | | | | | | | Merge branch 'jn/mergetool-hideresolved-is-optional'Junio C Hamano2021-03-143-8/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc: describe mergetool configuration in git-mergetool(1)Jonathan Nieder2021-03-131-0/+4
| * | | | | | | | | | mergetool: do not enable hideResolved by defaultJonathan Nieder2021-03-132-8/+3
* | | | | | | | | | | Merge branch 'tb/pack-revindex-on-disk'Junio C Hamano2021-03-141-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-151-2985/+3337
| * | | | | | | | | | | Merge branch 'master' of github.com:vnwildman/gitJiang Xin2021-03-151-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-061-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