diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-04-07 22:16:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-07 22:16:30 -0700 |
| commit | 54711243407791b188bf338e105cdc6d81ee4402 (patch) | |
| tree | 25afcee788a5f7ce0151c98a18d91a5ac0aab142 /merge-recursive.c | |
| parent | Merge branch 'dd/test-with-busybox' into HEAD (diff) | |
| parent | travis: build and test on Linux with musl libc and busybox (diff) | |
| download | tgif-54711243407791b188bf338e105cdc6d81ee4402.tar.xz | |
Merge branch 'dd/ci-musl-libc' into HEAD
* dd/ci-musl-libc:
travis: build and test on Linux with musl libc and busybox
ci/linux32: libify install-dependencies step
ci: refactor docker runner script
ci/linux32: parameterise command to switch arch
ci/lib-docker: preserve required environment variables
ci: make MAKEFLAGS available inside the Docker container in the Linux32 job
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions