diff options
| -rw-r--r-- | .cherry_picker.toml | 5 | ||||
| -rw-r--r-- | docs/docsite/rst/community/development_process.rst | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/.cherry_picker.toml b/.cherry_picker.toml new file mode 100644 index 0000000000..9a128daedf --- /dev/null +++ b/.cherry_picker.toml @@ -0,0 +1,5 @@ +team = "ansible" +repo = "ansible" +check_sha = "f31421576b00f0b167cdbe61217c31c21a41ac02" # the very first commit in repo +fix_commit_msg = false # Don't replace "#" with "GH-" +default_branch = "devel" diff --git a/docs/docsite/rst/community/development_process.rst b/docs/docsite/rst/community/development_process.rst index 9cebe5fe63..9d85ee00df 100644 --- a/docs/docsite/rst/community/development_process.rst +++ b/docs/docsite/rst/community/development_process.rst @@ -82,6 +82,13 @@ pull request to backport the change to a previous stable branch. but it can be helpful, especially when making multiple backport PRs for multiple stable branches. +.. note:: + + If you prefer, you can use CPython's cherry-picker tool to backport commits + from devel to stable branches in Ansible. Take a look at the `cherry-picker + documentation <https://pypi.org/p/cherry-picker#cherry-picking>`_ for + details on installing, configuring, and using it. + Ansibullbot =========== |