diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-11-11 13:56:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-11 13:56:30 -0800 |
| commit | 332fd5655a1e162b2fe47009dfc77ca2a94908e7 (patch) | |
| tree | b41171cbf1491fcfa389cf31a25b99f41b3620eb /git-rebase--merge.sh | |
| parent | Merge branch 'js/prepare-sequencer' (diff) | |
| parent | travis-ci: disable GIT_TEST_HTTPD for macOS (diff) | |
| download | tgif-332fd5655a1e162b2fe47009dfc77ca2a94908e7.tar.xz | |
Merge branch 'ls/macos-update'
Portability update and workaround for builds on recent Mac OS X.
* ls/macos-update:
travis-ci: disable GIT_TEST_HTTPD for macOS
Makefile: set NO_OPENSSL on macOS by default
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions