projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fa21fb2 aa9b3b2)
Merge branch 'ab/sha1dc-build' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 Feb 2018 23:08:24 +0000 (15:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Feb 2018 23:08:24 +0000 (15:08 -0800)
commitba9ff2b8367a22f7922db4675ec0d9aff46c406d
treec415984c7d7b2170abcab7e42cc677fe007933e5tree | snapshot
parentfa21fb2ec8acbede1bf0ed3cca9e96e2445d38d1commit | diff
parentaa9b3b25c68804a96075b233f5b5e0f17ba3e3e2commit | diff
Merge branch 'ab/sha1dc-build' into next

Push the submodule version of collision-detecting SHA-1 hash
implementation a bit harder on builders.

* ab/sha1dc-build:
  sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
  Makefile: under "make dist", include the sha1collisiondetection submodule
  Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto
Makefile diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.