kiss: swap to fetch/merge workflow

This commit is contained in:
Dylan Araps 2019-10-04 10:42:23 +03:00
parent b8c04223dc
commit 372eb2f5a9
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E

5
kiss
View File

@ -770,7 +770,8 @@ pkg_updates() {
git merge
else
log "$PWD" "Need root to update"
sudo git pull
sudo git fetch
sudo git merge
fi
}
done
@ -966,7 +967,7 @@ args() {
;;
v|version|-v|--version)
log kiss 0.41.0
log kiss 0.41.1
;;
h|help|-h|--help|'')