File tree Expand file tree Collapse file tree 3 files changed +5
-4
lines changed Expand file tree Collapse file tree 3 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ Patchwork
66 :target: https://pyup.io/repos/github/getpatchwork/patchwork/
77 :alt: Requirements Status
88
9- .. image :: https://codecov.io/gh/getpatchwork/patchwork/branch/master /graph/badge.svg
9+ .. image :: https://codecov.io/gh/getpatchwork/patchwork/branch/main /graph/badge.svg
1010 :target: https://codecov.io/gh/getpatchwork/patchwork
1111 :alt: Codecov
1212
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ There is no cadence for releases: they are made available as necessary.
5353Supported Versions
5454------------------
5555
56- Typically all development should occur on ``master ``. While we will backport
56+ Typically all development should occur on ``main ``. While we will backport
5757bugfixes and security updates, we will not backport any new features. This is
5858to ensure stability for users of these versions of Patchwork.
5959
@@ -100,12 +100,12 @@ Backporting
100100-----------
101101
102102We will occasionally backport bugfixes and security updates. When backporting a
103- patch, said patch should first be merged into ``master ``. Once merged, you can
103+ patch, said patch should first be merged into ``main ``. Once merged, you can
104104backport by cherry-picking commits, using the ``-x `` flag for posterity:
105105
106106.. code-block :: shell
107107
108- $ git cherry-pick -x < master_commit >
108+ $ git cherry-pick -x < main_commit >
109109
110110 There may be some conflicts; resolve these, uncommenting the `Conflicts ` line
111111when committing::
Original file line number Diff line number Diff line change 11---
2+ branch : main
23release_tag_re : ' v\d\.\d\.\d(rc\d+)?'
34pre_release_tag_re : ' (?P<pre_release>-rc(?:\d)*)$'
45sections :
You can’t perform that action at this time.
0 commit comments