kiss: swap to fetch/merge workflow

kisslinux · Oct 4, 2019 · 372eb2f · 372eb2f
1 parent b8c0422
commit 372eb2f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/kiss b/kiss
@@ -770,7 +770,8 @@ pkg_updates() {
                 git merge
             else
                 log "$PWD" "Need root to update"
-                sudo git pull
+                sudo git fetch
+                sudo git merge
             fi
         }
     done
@@ -966,7 +967,7 @@ args() {
         ;;
 
         v|version|-v|--version)
-            log kiss 0.41.0
+            log kiss 0.41.1
         ;;
 
         h|help|-h|--help|'')