aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormerakor <cem@ckyln.com>2020-05-08 09:54:38 +0000
committermerakor <cem@ckyln.com>2020-05-08 09:54:38 +0000
commit1e6fc1f606bfc04ab81f3eec27bbff7173de0be2 (patch)
tree5b411aa4277a8612070441c453dc17bd1b377cbe
parent361a1746a5d6ef0fb5fe90ea4d49bae5e9084a15 (diff)
downloadcpt-1.20.1.tar.gz
kiss: bump version1.20.1
FossilOrigin-Name: 1065af26fe21df4b513004c6dcc4eaa9fb1c8862d967e46b89eab0cb1a21f0c0
-rw-r--r--CHANGELOG.md9
-rwxr-xr-xkiss2
2 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c29cdec..5ea793b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,11 +7,18 @@ this project _somewhat_ adheres to [Semantic Versioning].
[Keep a Changelog]: https://keepachangelog.com/en/1.0.0/
[Semantic Versioning]: https://semver.org/spec/v2.0.0.html
+1.20.1 - 2020-05-08
+-------------------
+
+### Changed
+- Faster conflict resolution by using a conflict cache file.
+- Standardized `kiss-readlink` usage output.
+
1.20.0 - 2020-05-07
-------------------
### Added
-- `KISS_NOPROMPT` can be specified in order to skip prompts
+- `KISS_NOPROMPT` can be specified in order to skip prompts.
1.19.1 - 2020-05-07
-------------------
diff --git a/kiss b/kiss
index 55182a4..91e28b3 100755
--- a/kiss
+++ b/kiss
@@ -1487,7 +1487,7 @@ args() {
l|list) pkg_list "$@" ;;
u|update) pkg_updates ;;
s|search) for pkg do pkg_find "$pkg" all; done ;;
- v|version) log kiss 1.20.0 ;;
+ v|version) log kiss 1.20.1 ;;
h|help|-h|--help|'')
exec 2>&1