projects
/
~madcoder
/
dotfiles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proper way to launch awesome
[~madcoder/dotfiles.git]
/
+bin
/
git-up
diff --git
a/+bin/git-up
b/+bin/git-up
index
06a2c71
..
d9fc1cd
100755
(executable)
--- 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
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/~~)
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/}"
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"
;;
merge)
test -z "$unclean" || git stash save "git-up stash"