git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Fri, 11 Nov 2016 21:56:30 +0000 (13:56 -0800)
committer	Junio C Hamano <redacted>
	Fri, 11 Nov 2016 21:56:30 +0000 (13:56 -0800)
commit	332fd5655a1e162b2fe47009dfc77ca2a94908e7
tree	b41171cbf1491fcfa389cf31a25b99f41b3620eb	tree \| snapshot
parent	5de732f647609de15f51e98b9c9de07115b58b5c	commit \| diff
parent	a296bc01329b9e2aa91255c88626e8c8f831e428	commit \| diff

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

.travis.yml	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT

.travis.yml	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history