Branch name

tschaub · Jun 20, 2020 · be4cb17 · be4cb17
1 parent 6290079
commit be4cb17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,10 +3,10 @@ name: Test
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
 env:
   CI: true

diff --git a/tasks/changelog.sh b/tasks/changelog.sh
@@ -32,7 +32,7 @@ EOF
 #
 # Scan the git log for merge commit messages and output Markdown.  This only
 # follows the first parent of merge commits to avoid merges within a topic
-# branch (instead only showing merges to master).
+# branch (instead only showing merges to main).
 #
 main() {
   git log --first-parent --format='%s %b' ${1} |