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
6
6
:target: https://pyup.io/repos/github/getpatchwork/patchwork/
7
7
:alt: Requirements Status
8
8
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
10
10
:target: https://codecov.io/gh/getpatchwork/patchwork
11
11
:alt: Codecov
12
12
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.
53
53
Supported Versions
54
54
------------------
55
55
56
- Typically all development should occur on ``master ``. While we will backport
56
+ Typically all development should occur on ``main ``. While we will backport
57
57
bugfixes and security updates, we will not backport any new features. This is
58
58
to ensure stability for users of these versions of Patchwork.
59
59
@@ -100,12 +100,12 @@ Backporting
100
100
-----------
101
101
102
102
We 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
104
104
backport by cherry-picking commits, using the ``-x `` flag for posterity:
105
105
106
106
.. code-block :: shell
107
107
108
- $ git cherry-pick -x < master_commit >
108
+ $ git cherry-pick -x < main_commit >
109
109
110
110
There may be some conflicts; resolve these, uncommenting the `Conflicts ` line
111
111
when committing::
Original file line number Diff line number Diff line change 1
1
---
2
+ branch : main
2
3
release_tag_re : ' v\d\.\d\.\d(rc\d+)?'
3
4
pre_release_tag_re : ' (?P<pre_release>-rc(?:\d)*)$'
4
5
sections :
You can’t perform that action at this time.
0 commit comments