From c34cb696f5beb312b09417bb3483e3713851af2a Mon Sep 17 00:00:00 2001
From: Paul Walker <paul@blacksun.org.uk>
Date: Wed, 2 Feb 2022 11:47:44 +0000
Subject: [PATCH] bin: rmbr handle main/master

---
 bin/rmbr | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/rmbr b/bin/rmbr
index 4564699..c44cbe1 100755
--- a/bin/rmbr
+++ b/bin/rmbr
@@ -4,4 +4,9 @@ if [ $# -lt 1 ] ; then
     exit 1
 fi
 echo Removing branch $1
-git checkout $1 && git rebase master && git checkout master && git branch -d $1
+# Check for master/main
+TRUNK=$(git branch -l main | sed -e 's/\* //g')
+if [ "$TRUNK" == "" ] ; then
+  TRUNK=master
+fi
+git checkout $1 && git rebase $TRUNK && git checkout $TRUNK && git branch -d $1