From f6c865707f724ce8320f755c9693b46aa24a9718 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 7 Aug 2018 06:49:55 -0700 Subject: [PATCH] Add a changelog for PRs 264, 265, and 266. Fixes #279 --- cherry_picker/readme.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cherry_picker/readme.rst b/cherry_picker/readme.rst index 963e965..f5a94f5 100644 --- a/cherry_picker/readme.rst +++ b/cherry_picker/readme.rst @@ -342,6 +342,17 @@ Changelog 1.2.1 (in development) ----------------------- +- Validate the branch name to operate on with ``--continue`` and fail early if the branch could not + have been created by cherry_picker. (`PR #266 `_). + +- Bugfix: Allow ``--continue`` to support version branches that have dashes in them. This is + a bugfix of the additional branch versioning schemes introduced in 1.2.0. + (`PR #265 `_). + +- Bugfix: Be explicit about the branch name on the remote to push the cherry pick to. This allows + cherry_picker to work correctly when the user has a git push strategy other than the default + configured. (`PR #264 `_). + 1.2.0 -----