diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 7b66cb3..a8e62db 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -4,7 +4,7 @@ name: format on: pull_request: branches: - - master + - main workflow_dispatch: {} jobs: diff --git a/README.md b/README.md index 7cfa535..98ced66 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Bootstrap a new Go module in five minutes or less. ### Bootstrapping a new project 1. Create an empty (**non-initialized**) repository on GitHub. -2. Clone the master branch of this repository with +2. Clone the main branch of this repository with ``` $ git clone --single-branch git@github.com:makenew/gomodule.git $ cd @@ -48,7 +48,7 @@ Bootstrap a new Go module in five minutes or less. $ git diff --cached $ git commit -m "Replace makenew boilerplate" git remote add origin git@github.com:/.git - $ git push -u origin master + $ git push -u origin main ``` 6. Ensure the GitHub action passes, then release the initial version with @@ -72,7 +72,7 @@ You can then fetch and merge changes with ``` $ git fetch --no-tags upstream -$ git merge upstream/master +$ git merge upstream/main ``` #### Changelog for this skeleton