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