summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2017-07-01 22:05:46 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-07-03 10:09:34 -0700
commit86cfd61e6bc12745751c43b4f69886b290cd85cb (patch)
tree5a770d2400f5d4c37248d31056f962bf2cbe2cbf /.gitmodules
parentsha1dc: update from upstream (diff)
downloadtgif-86cfd61e6bc12745751c43b4f69886b290cd85cb.tar.xz
sha1dc: optionally use sha1collisiondetection as a submodule
Add an option to use the sha1collisiondetection library from the submodule in sha1collisiondetection/ instead of in the copy in the sha1dc/ directory. This allows us to try out the submodule in sha1collisiondetection without breaking the build for anyone who's not expecting them as we work out any kinks. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..cbeebdab7a
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "sha1collisiondetection"]
+ path = sha1collisiondetection
+ url = https://github.com/cr-marcstevens/sha1collisiondetection.git
+ branch = master