From 66786d45dc0a81c3bc1e205e1d17b16cae8e5a9f Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Wed, 23 Nov 2022 13:37:16 -0500 Subject: master -> main (#742) --- .github/workflows/test.yml | 2 +- README.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 46e70fe..74c2759 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ name: Test on: pull_request: push: - branches: [master, main, 'test-me-*'] + branches: [main, 'test-me-*'] tags: ['*'] jobs: diff --git a/README.rst b/README.rst index f4df853..10d060a 100644 --- a/README.rst +++ b/README.rst @@ -64,7 +64,7 @@ Issues are tracked on `GitHub `_. Patches may be submitted via a `GitHub pull request`_ or via the mailing list if you prefer. If you are comfortable doing so, please `rebase your changes`_ -so they may be applied to master with a fast-forward merge, and each commit is +so they may be applied to main with a fast-forward merge, and each commit is a coherent unit of work with a well-written log message. If you are not comfortable with this rebase workflow, the project maintainers will be happy to rebase your commits for you. @@ -84,4 +84,4 @@ All changes should include tests and pass flake8_. Changelog --------- -Please see `NEWS.rst `_. +Please see `NEWS.rst `_. -- cgit v1.2.1