From c4daf2511cfc9f1653a23a996216d60671656c62 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sun, 7 Aug 2022 07:53:23 -0700
Subject: git-dotfiles-rebase: rebase host-specific branch after signing

---
 bin/git-dotfiles-rebase | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/git-dotfiles-rebase b/bin/git-dotfiles-rebase
index f1daee3c..b7018a1f 100755
--- a/bin/git-dotfiles-rebase
+++ b/bin/git-dotfiles-rebase
@@ -12,7 +12,10 @@ sign () {
     branch=$(git rev-parse --abbrev-ref HEAD)
     [ "$branch" = "master" ] || git checkout master
     git commit -S --amend --no-edit
-    [ "$branch" = "master" ] || git checkout "$branch"
+    if [ "$branch" != "master" ]; then
+	git checkout "$branch"
+	git rebase master
+    fi
 }
 
 cd $HOME/src/dotfiles
-- 
cgit v1.2.3