X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.bin%2Fgit-rb-all;h=b4efb482a1887f558fffdf1f5634be4d68a3f06b;hb=fc774894456c8f9bd22c3863502aabc21975c8fe;hp=839d1432f68b4674fb757985464bfc4132b4a0d4;hpb=4d97d394d522aabc90e6d29a34928016a7ee9c24;p=home.git

diff --git a/.bin/git-rb-all b/.bin/git-rb-all
index 839d143..b4efb48 100755
--- a/.bin/git-rb-all
+++ b/.bin/git-rb-all
@@ -4,10 +4,15 @@
 rb_one() {
 	local b=$1
 
-	echo "### ${b}"
-	git checkout -q "${b}" || exit
-	if ! git rebase ; then
-		git rebase --abort
+	printf "### ${b}"
+	if ! git config --local "branch.${b}.merge" >/dev/null; then
+		echo " -> skipping due to missing merge branch"
+	else
+		echo
+		git checkout -q "${b}" || exit
+		if ! git rebase ; then
+			git rebase --abort
+		fi
 	fi
 }