summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* CI: upgrade to macos-12, and pin OSX versionÆvar Arnfjörð Bjarmason2022-12-073-4/+4
* Downmerge a bit more for 2.38.2Junio C Hamano2022-10-281-0/+13
* Merge branch 'rs/archive-dedup-printf' into maint-2.38Junio C Hamano2022-10-281-5/+3
|\
| * archive: deduplicate verbose printingRené Scharfe2022-10-111-5/+3
* | Merge branch 'jh/struct-zero-init-with-older-clang' into maint-2.38Junio C Hamano2022-10-281-0/+25
|\ \
| * | config.mak.dev: disable suggest braces error on old clang versionsJeff Hostetler2022-10-101-0/+25
* | | Merge branch 'rs/use-fspathncmp' into maint-2.38Junio C Hamano2022-10-281-3/+1
|\ \ \
| * | | dir: use fspathncmp() in pl_hashmap_cmp()Jeff King2022-10-091-3/+1
| |/ /
* | | Merge branch 'rj/branch-edit-desc-unborn' into maint-2.38Junio C Hamano2022-10-282-2/+58
|\ \ \
| * | | branch: description for non-existent branch errorsRubén Justo2022-10-082-2/+58
* | | | Merge branch 'pw/remove-rebase-p-test' into maint-2.38Junio C Hamano2022-10-281-8/+0
|\ \ \ \
| * | | | t3435: remove redundant test casePhillip Wood2022-10-101-8/+0
* | | | | Merge branch 'jc/use-of-uc-in-log-messages' into maint-2.38Junio C Hamano2022-10-281-1/+3
|\ \ \ \ \
| * | | | | SubmittingPatches: use usual capitalization in the log message bodyJunio C Hamano2022-10-071-1/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'jc/tmp-objdir' into maint-2.38Junio C Hamano2022-10-281-36/+4
|\ \ \ \ \
| * | | | | tmp-objdir: skip clean up when handling a signalJohn Cai2022-10-011-36/+4
| |/ / / /
* | | | | Merge branch 'dd/document-runtime-prefix-better' into maint-2.38Junio C Hamano2022-10-281-2/+3
|\ \ \ \ \
| * | | | | Makefile: clarify runtime relative gitexecdirĐoàn Trần Công Danh2022-10-061-2/+3
* | | | | | Merge branch 'ab/unused-annotation' into maint-2.38Junio C Hamano2022-10-281-1/+4
|\ \ \ \ \ \
| * | | | | | git-compat-util.h: GCC deprecated message arg only in GCC 4.5+Alejandro R. Sedeño2022-10-061-1/+4
* | | | | | | Merge branch 'tb/midx-repack-ignore-cruft-packs' into maint-2.38Junio C Hamano2022-10-283-6/+107
|\ \ \ \ \ \ \
| * | | | | | | midx.c: avoid cruft packs with non-zero `repack --batch-size`Taylor Blau2022-09-212-0/+43
| * | | | | | | midx.c: remove unnecessary loop conditionTaylor Blau2022-09-211-1/+1
| * | | | | | | midx.c: replace `xcalloc()` with `CALLOC_ARRAY()`Taylor Blau2022-09-211-1/+3
| * | | | | | | midx.c: avoid cruft packs with `repack --batch-size=0`Taylor Blau2022-09-212-0/+25
| * | | | | | | midx.c: prevent `expire` from removing the cruft packTaylor Blau2022-09-213-3/+33
| * | | | | | | Documentation/git-multi-pack-index.txt: clarify expire behaviorTaylor Blau2022-09-211-2/+3
| * | | | | | | Documentation/git-multi-pack-index.txt: fix typoTaylor Blau2022-09-211-1/+1
* | | | | | | | Merge branch 'so/diff-merges-cleanup' into maint-2.38Junio C Hamano2022-10-282-19/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | diff-merges: clarify log.diffMerges documentationSergey Organov2022-09-161-3/+3
| * | | | | | | | diff-merges: cleanup set_diff_merges()Sergey Organov2022-09-161-11/+19
| * | | | | | | | diff-merges: cleanup func_by_opt()Sergey Organov2022-09-161-5/+5
* | | | | | | | | Merge branch 'rj/ref-filter-get-head-description-leakfix' into maint-2.38Junio C Hamano2022-10-281-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ref-filter.c: fix a leak in get_head_descriptionRubén Justo2022-09-261-0/+2
* | | | | | | | | | Merge branch 'jc/environ-docs' into maint-2.38Junio C Hamano2022-10-282-16/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | environ: GIT_INDEX_VERSION affects not just a new repositoryJunio C Hamano2022-09-161-2/+2
| * | | | | | | | | | environ: simplify description of GIT_INDEX_FILEJunio C Hamano2022-09-161-1/+1
| * | | | | | | | | | environ: GIT_FLUSH should be made a usual BooleanJunio C Hamano2022-09-152-0/+2
| * | | | | | | | | | environ: explain Boolean environment variablesJunio C Hamano2022-09-151-13/+18
| * | | | | | | | | | environ: document GIT_SSL_NO_VERIFYJunio C Hamano2022-09-151-0/+5
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Makefile: force -O0 when compiling with SANITIZE=leakJeff King2022-10-281-0/+1
* | | | | | | | | | Downmerge a handful of topics for 2.38.2Junio C Hamano2022-10-262-1/+48
* | | | | | | | | | Merge branch 'jk/cleanup-callback-parameters' into maint-2.38Junio C Hamano2022-10-264-57/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | attr: drop DEBUG_ATTR codeJeff King2022-10-061-38/+3
| * | | | | | | | | | commit: avoid writing to global in option callbackJeff King2022-10-061-2/+2
| * | | | | | | | | | multi-pack-index: avoid writing to global in option callbackJeff King2022-10-061-3/+4
| * | | | | | | | | | test-submodule: inline resolve_relative_url() functionJeff King2022-10-061-14/+8
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/gc-pack-refs-simplify' into maint-2.38Junio C Hamano2022-10-261-9/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gc: simplify maintenance_task_pack_refs()René Scharfe2022-10-051-9/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'nb/doc-mergetool-typofix' into maint-2.38Junio C Hamano2022-10-261-1/+1
|\ \ \ \ \ \ \ \ \ \