diff options
author | dylan.araps@gmail.com <dylan.araps@gmail.com> | 2019-10-04 07:42:22 +0000 |
---|---|---|
committer | dylan.araps@gmail.com <dylan.araps@gmail.com> | 2019-10-04 07:42:22 +0000 |
commit | 71e8c40c90cac0403890f65ef4e4ce3da2c1e162 (patch) | |
tree | a640d42a0288020cac1a80a91e4e78eb54b4339b | |
parent | 4d9a347064c524d0b51f3fec32447f337c9c980b (diff) | |
download | cpt-71e8c40c90cac0403890f65ef4e4ce3da2c1e162.tar.gz |
kiss: swap to fetch/merge workflow
FossilOrigin-Name: 8d30833071e4628c8c8555f6f1d1ac5a028c59d557093f568f62283b6a9f78fb
-rwxr-xr-x | kiss | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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|'') |