From bc42a3f8ef94da5695ec602e012d4d3a461c356f Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Tue, 17 Nov 2020 11:12:27 -0700
Subject: [PATCH] feat: auto rebase on git bsync command

---
 git/githelpers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/githelpers b/git/githelpers
index e90a2e0..2955771 100644
--- a/git/githelpers
+++ b/git/githelpers
@@ -58,7 +58,7 @@ update_branch() {
     git stash
     new_stash=$(git rev-parse -q --verify refs/stash)
     # checkout branch and sync to remote, then come back
-    git checkout ${BRANCH} && git sync ${REMOTE} && git checkout -
+    git checkout ${BRANCH} && git sync ${REMOTE} && git checkout - && git rebase ${BRANCH}
     # if the stash added to the stack, pop it back off
     [ "$old_stash" != "$new_stash" ] && git stash pop
 }