Skip to content

Commit 948c51c

Browse files
committed
Replace references to master with main
Signed-off-by: Stephen Finucane <[email protected]> (cherry picked from commit c3e5c88) (cherry picked from commit 13f86fb)
1 parent 78e257d commit 948c51c

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

docs/development/releasing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ There is no cadence for releases: they are made available as necessary.
5353
Supported 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
5757
bugfixes and security updates, we will not backport any new features. This is
5858
to ensure stability for users of these versions of Patchwork.
5959

@@ -100,12 +100,12 @@ Backporting
100100
-----------
101101

102102
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
104104
backport 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
111111
when committing::

releasenotes/config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
branch: main
23
release_tag_re: 'v\d\.\d\.\d(rc\d+)?'
34
pre_release_tag_re: '(?P<pre_release>-rc(?:\d)*)$'
45
sections:

0 commit comments

Comments
 (0)