Loading .shell/funcs +8 −1 Original line number Diff line number Diff line Loading @@ -90,6 +90,13 @@ update_submodules() git stash store -m "$msg" $stash echo "Failed to unstash changes, the stash has been left on the" \ "stack. ($stash)" >&2 echo "Automatic merge has not been pushed, please check for" \ "conflicts and push manually" >&2 elif ! git push origin master:master; then echo "Automatic merge push failed, this may mean the remote" \ "'origin' has not been set" >&2 else echo "Submodules have been updated, merged and pushed to origin" >&2 fi } Loading Loading
.shell/funcs +8 −1 Original line number Diff line number Diff line Loading @@ -90,6 +90,13 @@ update_submodules() git stash store -m "$msg" $stash echo "Failed to unstash changes, the stash has been left on the" \ "stack. ($stash)" >&2 echo "Automatic merge has not been pushed, please check for" \ "conflicts and push manually" >&2 elif ! git push origin master:master; then echo "Automatic merge push failed, this may mean the remote" \ "'origin' has not been set" >&2 else echo "Submodules have been updated, merged and pushed to origin" >&2 fi } Loading