From 04cbe4bf3e74608f4aa5770f88c21f8c72179651 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Thu, 30 Jul 2020 16:21:29 +0200
Subject: [PATCH] TkgThingy: Use recursive git pull origin master instead of
 git submodule update --remote to update submodules. This should bypass the
 desynchronization with remote master branches and make updating everything
 more robust, as it was before the submodules introduction.

---
 TkgThingy | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/TkgThingy b/TkgThingy
index 5b3a074..383f59e 100755
--- a/TkgThingy
+++ b/TkgThingy
@@ -136,7 +136,12 @@ _main_loop() {
     echo -e "What do you want to do?"
     read -rp "`echo $'  > 1.Create missing external config files\n    2.Update submodules\n    3.Exit\nchoice[1-3?]: '`" _choice;
     if [ "$_choice" == "2" ]; then
-        git submodule update --remote
+        #git submodule update --remote
+        for _tkg_tools in */; do
+          if [ "$_tkg_tools" != ".git" ]; then
+            ( cd "$_tkg_tools" && git config pull.rebase false && git pull origin master )
+          fi
+        done
     elif [ "$_choice" == "3" ]; then
         exit 0
     else