Merge pull request ethereum#147 from pacrob/master-to-main

change master branch refs to main
pacrob · Nov 27, 2023 · c9990f7 · c9990f7
2 parents 7d49969 + e990db1
commit c9990f7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -11,7 +11,7 @@ Closes #
 
 - [ ] Add or update documentation related to these changes
 
-- [ ] Add entry to the [release notes](https://github.com/ethereum/py-trie/blob/master/newsfragments/README.md)
+- [ ] Add entry to the [release notes](https://github.com/ethereum/py-trie/blob/main/newsfragments/README.md)
 
 #### Cute Animal Picture
 

diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ The version format for this repo is `{major}.{minor}.{patch}` for stable, and
 
 To issue the next version in line, specify which part to bump,
 like `make release bump=minor` or `make release bump=devnum`. This is typically done from the
-master branch, except when releasing a beta (in which case the beta is released from master,
+main branch, except when releasing a beta (in which case the beta is released from main,
 and the previous stable branch is released from said branch).
 
 If you are in a beta version, `bumpversion stage` will switch to a stable.

diff --git a/newsfragments/147.internal.rst b/newsfragments/147.internal.rst
@@ -0,0 +1 @@
+Change the name of ``master`` branch to ``main``
diff --git a/pyproject.toml b/pyproject.toml
@@ -68,7 +68,7 @@ log_format = "%(levelname)8s  %(asctime)s  %(filename)20s  %(message)s"
 log_date_format = "%m-%d %H:%M:%S"
 
 [tool.towncrier]
-# Read https://github.com/ethereum/py-trie/blob/master/newsfragments/README.md for instructions
+# Read https://github.com/ethereum/py-trie/blob/main/newsfragments/README.md for instructions
 package = "trie"
 filename = "CHANGELOG.rst"
 directory = "newsfragments"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Change the name of ``master`` branch to ``main``