Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ To check if a feature branch adds at least one news fragment, run::

towncrier check

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

towncrier check --compare-with origin/main
towncrier check --compare-with origin/master

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.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"Mailing list": "https://mail.python.org/mailman3/lists/twisted.python.org/",
"Issues": "https://github.com/twisted/towncrier/issues",
"Repository": "https://github.com/twisted/towncrier",
"Tests": "https://github.com/twisted/towncrier/actions?query=branch%3Amaster",
"Tests": "https://github.com/twisted/towncrier/actions?query=branch%3Atrunk",
"Coverage": "https://codecov.io/gh/twisted/towncrier",
"Distribution": "https://pypi.org/project/towncrier",
},
Expand Down
2 changes: 1 addition & 1 deletion src/towncrier/check.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def get_default_compare_branch(base_directory, encoding):
help=(
"Checks files changed running git diff --name-ony BRANCH... "
"BRANCH is the branch to be compared with. "
"Default to origin/master"
"Default to origin/main"
),
)
@click.option(
Expand Down
Empty file.