From be4cb1782d21235ae4611a096745197e9828d3ee Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Sat, 20 Jun 2020 15:48:28 -0600
Subject: [PATCH] Branch name

---
 .github/workflows/test.yml | 4 ++--
 tasks/changelog.sh         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8ff2dfbe..c2f22409 100644
--- 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
index c3323606..2c3381fc 100755
--- 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} |