summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 0f12f42..1e0d116 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -27,9 +27,12 @@
path = maintained/check_ssl_cert
url = ssh://aur@aur.archlinux.org/check_ssl_cert.git
branch = master
+ update = merge
[submodule "maintained/thruk"]
path = maintained/thruk
url = ssh://aur@aur.archlinux.org/thruk.git
+ branch = master
+ update = merge
[submodule "maintained/z80ex"]
path = maintained/z80ex
url = ssh://aur@aur.archlinux.org/z80ex