cpt

commit 372eb2f5a9ab0e013c05dd3274cef9646d7d0fea
parent b8c04223dc2762f292beb1f0ff12c1300c61acc7
Author: Dylan Araps <dylan.araps@gmail.com>
Date:   Fri,  4 Oct 2019 10:42:23 +0300

kiss: swap to fetch/merge workflow

Diffstat:
M
kiss
 | 
5
+++--

1 file changed, 3 insertions(+), 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|'')