From f6dcf6218c9adae5299900f894309d1c83ebebaf Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Mon, 3 Feb 2020 18:25:12 +1100
Subject: [PATCH] Version 1.6.0

---
 CHANGELOG.md          | 2 ++
 git-ftp               | 2 +-
 man/git-ftp.1.md      | 4 ++--
 tests/git-ftp-test.sh | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e7ca40..66e03ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ Version 1.6.0-UNRELEASED
 * Add support for option `--insecure` for LFTP actions (download and pull)
 * Add support for FTPES for LFTP actions (download and pull)
 * Add better error messages for curl errors
+* Support --no-commit option for pull action
+* Documentation updates
 
 Version 1.5.2
 =============
diff --git a/git-ftp b/git-ftp
index c9c5fc9..be42bdf 100755
--- a/git-ftp
+++ b/git-ftp
@@ -24,7 +24,7 @@
 readonly DEFAULT_PROTOCOL="ftp"
 readonly REMOTE_LCK_FILE="$(basename "$0").lck"
 readonly SYSTEM="$(uname)"
-readonly VERSION='1.6.0-UNRELEASED'
+readonly VERSION='1.6.0'
 
 # ------------------------------------------------------------
 # Defaults
diff --git a/man/git-ftp.1.md b/man/git-ftp.1.md
index df9dc09..986280d 100644
--- a/man/git-ftp.1.md
+++ b/man/git-ftp.1.md
@@ -1,6 +1,6 @@
-% GIT-FTP(1) Git-ftp 1.6.0-UNRELEASED
+% GIT-FTP(1) Git-ftp 1.6.0
 %
-% 2019-05-06
+% 2020-02-03
 
 This is the manual for version 1.6.0-UNRELEASED.
 Please consider the [changelog](../CHANGELOG.md) or select your version from
diff --git a/tests/git-ftp-test.sh b/tests/git-ftp-test.sh
index 695fff5..734138e 100755
--- a/tests/git-ftp-test.sh
+++ b/tests/git-ftp-test.sh
@@ -17,7 +17,7 @@
 # Or you can write it in one line:
 #     TEST_CASES='test_displays_usage' GIT_FTP_PASSWD='s3cr3t' ./git-ftp-test.sh
 
-readonly VERSION='1.6.0-UNRELEASED'
+readonly VERSION='1.6.0'
 
 # ------------------------------------------------------------
 # Constant Exit Error Codes