From 4d9a347064c524d0b51f3fec32447f337c9c980b Mon Sep 17 00:00:00 2001
From: "dylan.araps@gmail.com" <dylan.araps@gmail.com>
Date: Wed, 2 Oct 2019 17:46:34 +0000
Subject: kiss: swap to git fetch/merge for updates

FossilOrigin-Name: 6e905c44588d974e2f6798028e5cecb2e126ae774578bae2c5f40952c0611101
---
 kiss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'kiss')

diff --git a/kiss b/kiss
index b88102e..162e4ec 100755
--- a/kiss
+++ b/kiss
@@ -766,7 +766,8 @@ pkg_updates() {
             log "$PWD" "Updating repository"
 
             if [ -w "$PWD" ]; then
-                git pull
+                git fetch
+                git merge
             else
                 log "$PWD" "Need root to update"
                 sudo git pull
-- 
cgit v1.2.3