diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2022-10-18 17:49:18 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2022-10-18 17:49:18 +0200 |
| commit | 4c6281beb32a7f88e0f843c575c3f16d65936c6e (patch) | |
| tree | f7571f96f14018be0e947e98bddfcb6709fa974e | |
| parent | 21fd8cb74228da8deb00e21ec63d59d04930de06 (diff) | |
| download | arch-4c6281beb32a7f88e0f843c575c3f16d65936c6e.tar.gz arch-4c6281beb32a7f88e0f843c575c3f16d65936c6e.tar.bz2 | |
fixed some merges and branches in submodules
| -rw-r--r-- | .gitmodules | 3 |
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 |