fixed submodule origins and update behaviour

1 files changed, 37 insertions, 3 deletions

diff --git a/.gitmodules b/.gitmodules
index b86f37c..7576d1e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,71 +1,105 @@
 [submodule "maintained/gsoap287"]
 	path = maintained/gsoap287
 	url = ssh://aur@aur.archlinux.org/gsoap287.git
+	branch = master
+	update = rebase
 [submodule "owned/pgfuse"]
 	path = owned/pgfuse
 	url = ssh://aur@aur.archlinux.org/pgfuse.git
+	branch = master
+	update = rebase
 [submodule "owned/sqlitexx"]
 	path = owned/sqlitexx
 	url = ssh://aur@aur.archlinux.org/sqlitexx.git
+	branch = master
+	update = rebase
 [submodule "maintained/pcc-libs-cvs"]
 	path = maintained/pcc-libs-cvs
 	url = ssh://aur@aur.archlinux.org/pcc-libs-cvs.git
+	branch = master
+	update = rebase
 [submodule "maintained/pcc-cvs"]
 	path = maintained/pcc-cvs
 	url = ssh://aur@aur.archlinux.org/pcc-cvs.git
+	branch = master
+	update = rebase
 [submodule "maintained/libunac"]
 	path = maintained/libunac
 	url = ssh://aur@aur.archlinux.org/libunac.git
+	branch = master
+	update = rebase
 [submodule "maintained/shmux"]
 	path = maintained/shmux
 	url = ssh://aur@aur.archlinux.org/shmux.git
+	branch = master
+	update = rebase
 [submodule "maintained/perl-http-daemon-ssl"]
 	path = maintained/perl-http-daemon-ssl
 	url = ssh://aur@aur.archlinux.org/perl-http-daemon-ssl
 	branch = master
+	update = rebase
 [submodule "maintained/check_ssl_cert"]
 	path = maintained/check_ssl_cert
 	url = ssh://aur@aur.archlinux.org/check_ssl_cert.git
 	branch = master
-	update = merge
+	update = rebase
 [submodule "maintained/thruk"]
 	path = maintained/thruk
 	url = ssh://aur@aur.archlinux.org/thruk.git
 	branch = master
-	update = merge
+	update = rebase
 [submodule "maintained/z80ex"]
 	path = maintained/z80ex
 	url = ssh://aur@aur.archlinux.org/z80ex
 	branch = master
+	update = rebase
 [submodule "maintained/notion3"]
 	path = maintained/notion3
 	url = ssh://aur@aur.archlinux.org/notion3.git
+	branch = master
+	update = rebase
 [submodule "maintained/libwebp052"]
 	path = maintained/libwebp052
 	url = ssh://aur@aur.archlinux.org/libwebp052.git
+	branch = master
+	update = rebase
 [submodule "maintained/newsboat-og"]
 	path = maintained/newsboat-og
 	url = ssh://aur@aur.archlinux.org/newsboat-og.git
+	branch = master
+	update = rebase
 [submodule "maintained/librsvg-og"]
 	path = maintained/librsvg-og
 	url = ssh://aur@aur.archlinux.org/librsvg-og.git
+	branch = master
+	update = rebase
 [submodule "maintained/cppdb"]
 	path = maintained/cppdb
 	url = ssh://aur@aur.archlinux.org/cppdb.git
+	branch = master
+	update = rebase
 [submodule "maintained/cppcms"]
 	path = maintained/cppcms
 	url = ssh://aur@aur.archlinux.org/cppcms.git
+	branch = master
+	update = rebase
 [submodule "maintained/pdfalto"]
 	path = maintained/pdfalto
 	url = ssh://aur@aur.archlinux.org/pdfalto.git
+	branch = master
+	update = rebase
 [submodule "maintained/pacman-static"]
 	path = maintained/pacman-static
 	url = ssh://aur@aur.archlinux.org/pacman-static
-	update = rebase
 	branch = master
+	update = rebase
 [submodule "maintained/xxdiff-git"]
 	path = maintained/xxdiff-git
 	url = ssh://aur@aur.archlinux.org/xxdiff-git.git
+	branch = master
+	update = rebase
 [submodule "maintained/arduino1"]
 	path = maintained/arduino1
 	url = ssh://aur@aur.archlinux.org/arduino1
+	branch = master
+	update = rebase