kiss: swap to git fetch/merge for updates

2019-10-02 20:46:35 +03:00 · 2019-10-02 20:46:35 +03:00 · b8c04223dc
parent 1f1124c251
commit b8c04223dc
1 changed files with 2 additions and 1 deletions
--- a/3
+++ b/3
@ -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