Merge branch 'ti/external-sha1dc' into next
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Aug 2017 06:01:30 +0000 (23:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Aug 2017 06:01:30 +0000 (23:01 -0700)
Platforms that ship with a separate sha1 with collision detection
library can link to it instead of using the copy we ship as part of
our source tree.

* ti/external-sha1dc:
sha1dc: allow building with the external sha1dc library
sha1dc: build git plumbing code more explicitly

1  2 
Makefile
diff --cc Makefile
Simple merge