Skip to content

Commit 96052d9

Browse files
authored
Update the changelog (GH-260)
1 parent 35f40a1 commit 96052d9

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
"""Backport CPython changes from master to maintenance branches."""
2-
__version__ = '1.1.2.dev1'
2+
__version__ = '1.2.0.dev1'

cherry_picker/readme.rst

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,19 @@ in the directory where ``pyproject.toml`` exists::
339339
Changelog
340340
=========
341341

342-
1.1.2 (in development)
342+
1.2.0 (in development)
343343
----------------------
344344

345+
- Add ``default_branch`` configuration item. The default is ``master``, which
346+
is the default branch for CPython. It can be configured to other branches like,
347+
``devel``, or ``develop``. The default branch is the branch cherry_picker
348+
will return to after backporting. (`PR #254 <https://github.com/python/core-workflow/pull/254>`_
349+
and `Issue #250 <https://github.com/python/core-workflow/issues/250>`_).
350+
351+
- Support additional branch versioning schemes, such as ``something-X.Y``,
352+
or ``X.Y-somethingelse``. (`PR #253 <https://github.com/python/core-workflow/pull/253>`_
353+
and `Issue #251 <https://github.com/python/core-workflow/issues/251>`_).
354+
345355
1.1.1
346356
-----
347357

0 commit comments

Comments
 (0)