From b8c04223dc2762f292beb1f0ff12c1300c61acc7 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Wed, 2 Oct 2019 20:46:35 +0300
Subject: [PATCH] kiss: swap to git fetch/merge for updates

---
 kiss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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