From dcb5cd4d4fa23103beaa6bac8c14795acf53714f Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Sun, 28 Jun 2020 10:00:46 +0300
Subject: [PATCH] kiss: Swap to git pulls for updates

---
 kiss | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kiss b/kiss
index d059fd7..1b14649 100755
--- a/kiss
+++ b/kiss
@@ -1194,8 +1194,7 @@ pkg_updates() {
             esac
 
             if [ -w "$PWD" ] && [ "$uid" != 0 ]; then
-                git fetch
-                git merge
+                git pull
                 git submodule update --remote --init -f
 
             else
@@ -1219,8 +1218,7 @@ pkg_updates() {
                     # on the other hand requires that each argument be
                     # properly quoted as the command passed to it must
                     # be a string... This sets quotes where needed.
-                    git_cmd="git fetch && git merge"
-                    git_cmd="$git_cmd && git submodule update --remote --init -f"
+                    git_cmd="git pull && git submodule update --remote --init -f"
                     case $su in *su) git_cmd="'$git_cmd'"; esac
 
                     # Spawn a subshell to run multiple commands as