aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordylan.araps@gmail.com <dylan.araps@gmail.com>2019-10-02 17:46:34 +0000
committerdylan.araps@gmail.com <dylan.araps@gmail.com>2019-10-02 17:46:34 +0000
commit4d9a347064c524d0b51f3fec32447f337c9c980b (patch)
tree4449fc31ec0020a96a8555de2f4c245f388e4a4c
parente25be98b0a93e9d4b439808f9e625cf3b451a444 (diff)
downloadcpt-4d9a347064c524d0b51f3fec32447f337c9c980b.tar.gz
kiss: swap to git fetch/merge for updates
FossilOrigin-Name: 6e905c44588d974e2f6798028e5cecb2e126ae774578bae2c5f40952c0611101
-rwxr-xr-xkiss3
1 files changed, 2 insertions, 1 deletions
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