From 71e8c40c90cac0403890f65ef4e4ce3da2c1e162 Mon Sep 17 00:00:00 2001
From: "dylan.araps@gmail.com" <dylan.araps@gmail.com>
Date: Fri, 4 Oct 2019 07:42:22 +0000
Subject: kiss: swap to fetch/merge workflow

FossilOrigin-Name: 8d30833071e4628c8c8555f6f1d1ac5a028c59d557093f568f62283b6a9f78fb
---
 kiss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'kiss')

diff --git a/kiss b/kiss
index 162e4ec..4dcb763 100755
--- 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|'')
-- 
cgit v1.2.3