Skip to content

Commit 0942047

Browse files
committed
KIll a few masters
1 parent 672eca3 commit 0942047

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ To check if a feature branch adds at least one news fragment, run::
191191

192192
towncrier check
193193

194-
By default this compares the current branch against ``origin/master``. You can use ``--compare-with`` if the trunk is named differently::
194+
By default this compares the current branch against ``origin/main``. You can use ``--compare-with`` if the trunk is named differently::
195195

196-
towncrier check --compare-with origin/main
196+
towncrier check --compare-with origin/master
197197

198198
The check is automatically skipped when the main news file is modified inside the branch as this signals a release branch that is expected to not have news fragments.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"Mailing list": "https://mail.python.org/mailman3/lists/twisted.python.org/",
1818
"Issues": "https://github.com/twisted/towncrier/issues",
1919
"Repository": "https://github.com/twisted/towncrier",
20-
"Tests": "https://github.com/twisted/towncrier/actions?query=branch%3Amaster",
20+
"Tests": "https://github.com/twisted/towncrier/actions?query=branch%3Atrunk",
2121
"Coverage": "https://codecov.io/gh/twisted/towncrier",
2222
"Distribution": "https://pypi.org/project/towncrier",
2323
},

src/towncrier/check.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def get_default_compare_branch(base_directory, encoding):
4545
help=(
4646
"Checks files changed running git diff --name-ony BRANCH... "
4747
"BRANCH is the branch to be compared with. "
48-
"Default to origin/master"
48+
"Default to origin/main"
4949
),
5050
)
5151
@click.option(

0 commit comments

Comments
 (0)