git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2639382 edb6a17)
Merge branch 'ab/dc-sha1-loose-ends'
authorJunio C Hamano <redacted>
Tue, 9 Jan 2018 22:32:53 +0000 (14:32 -0800)
committerJunio C Hamano <redacted>
Tue, 9 Jan 2018 22:32:53 +0000 (14:32 -0800)
commita09a5e6c36d21d1697ab369ef917af7a682a25c5
tree83d3faf2005a5db79b9c12ac09475b7a5bc8c60ftree | snapshot
parent26393822f88200304675283ac5b10e1e1f1b876bcommit | diff
parentedb6a17c36be107e87abd1ff641f317ea578e80ecommit | diff
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
Makefile diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT