Points git to main instead of master

craveytrain · Jul 6, 2022 · a870964 · a870964
1 parent 55599e4
commit a870964
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.bin/git-scrub b/.bin/git-scrub
@@ -26,7 +26,7 @@ fi
 # then delete them. We use the remote master here, just in case our
 # local master is out of date.
 
-MERGED_ON_REMOTE=`git branch --color=never --merged origin/master | grep -v "\*"`
+MERGED_ON_REMOTE=`git branch --color=never --merged origin/main | grep -v "\*"`
 
 if [ "$MERGED_ON_REMOTE" ]; then
 	echo "The following remote branches are fully merged and will be removed:"

diff --git a/.gitconfig b/.gitconfig
@@ -42,7 +42,7 @@
 
   upgrade-submodules = submodule update --init --remote
 
-  ancestor = merge-base HEAD master
+  ancestor = merge-base HEAD origin/HEAD
 [branch]
   autosetuprebase = always
 [clean]