[TASK] modify git update statement

2 years ago · 32059536e6
1 changed files with 2 additions and 2 deletions
--- a/gind-repo-makepkg.sh
+++ b/gind-repo-makepkg.sh
@ -2,5 +2,5 @@
 SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
 cd $SCRIPT_DIR

-git submodule update --remote
-git submodule foreach "../makepkg-and-update-db.sh $1"
+git submodule update --remote --merge --force
+git submodule foreach "../makepkg-and-update-db.sh $1"