X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.bin%2Fgit-rb-all;h=ef3f54c773596eb17cf39607052b1392f2f947e5;hb=fa1a0920fe3009bd92dc6872e265588b998b4d19;hp=e20c83aca54e70591abb39d73ecae48bfff9ac2b;hpb=86bc09eb6d303ca3a4d8b439b6522cab0156c670;p=home.git

diff --git a/.bin/git-rb-all b/.bin/git-rb-all
index e20c83a..ef3f54c 100755
--- a/.bin/git-rb-all
+++ b/.bin/git-rb-all
@@ -9,7 +9,7 @@ rb_one() {
 		echo " -> skipping due to missing merge branch"
 	else
 		echo
-		git checkout -q "${b}" || exit
+		git checkout -q "${b}" || return
 		if ! git rebase ; then
 			git rebase --abort
 		fi
@@ -28,6 +28,9 @@ main() {
 		usage
 	fi
 
+	# Switch to the top dir in case the working dir doesn't exist in every branch.
+	cd "$(git rev-parse --show-toplevel)" || return
+
 	local orig b branches
 	orig=$(git rev-parse --abbrev-ref HEAD) || return