X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=%2Bbin%2Fgit-up;h=d9fc1cd2cc7ecc7b63391852160804d467afe95f;hb=40b9c600ad8022476c9c8b65572a6b0145270dd7;hp=06a2c71ff944bf4bc4377f19407e731f4b14882e;hpb=5923f706617b966f114656c78bd60108d4ab1dde;p=~madcoder%2Fdotfiles.git

diff --git a/+bin/git-up b/+bin/git-up
index 06a2c71..d9fc1cd 100755
--- a/+bin/git-up
+++ b/+bin/git-up
@@ -8,7 +8,7 @@ r,rebase    perform a rebase
 m,merge     perform a merge
 "
 SUBDIRECTORY_OK=t
-. git-sh-setup
+. "$(git --exec-path)/git-sh-setup"
 require_work_tree
 
 lbranch=$(git symbolic-ref HEAD | sed -e s~refs/heads/~~)
@@ -79,6 +79,7 @@ case "$action" in
     rebase)
         test -z "$unclean" || git stash save "git-up stash"
         git rebase "${remote}/${branch#refs/heads/}"
+        cd "$(dirname "$(git rev-parse --git-dir)")" && git submodule update --rebase
         ;;
     merge)
         test -z "$unclean" || git stash save "git-up stash"