| commit | a09a5e6c36d21d1697ab369ef917af7a682a25c5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 9 Jan 2018 22:32:53 +0000 (9 14:32 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 9 Jan 2018 22:32:53 +0000 (9 14:32 -0800) | ||
| tree | 83d3faf2005a5db79b9c12ac09475b7a5bc8c60f | treesnapshot (tar.gz zip) |
| parent | 26393822f88200304675283ac5b10e1e1f1b876b | commitdiff |
| parent | edb6a17c36be107e87abd1ff641f317ea578e80e | commitdiff |
Merge branch 'ab/dc-sha1-loose-ends'
Tying loose ends for the recent integration work of
collision-detecting SHA-1 implementation.
* ab/dc-sha1-loose-ends:
Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1
Tying loose ends for the recent integration work of
collision-detecting SHA-1 implementation.
* ab/dc-sha1-loose-ends:
Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1
| Makefile | diff1 | diff2 | blobhistory |