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/~~)
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"